Check to make sure query has options present
Revert "Check to make sure query has options present"

This reverts commit 604ddcc543461ff1d9e4807a3cb1a2c3eecfe531.
Merge branch 'staging'