query shouldn't be optional if there are any required params (#254)

query shouldn't be optional if there are any required params (#254) #502