Revert "Check to make sure query has options present"

This reverts commit 1438caf1e52623ea1dc992f02abb7ff2c94bc4bb.