Corrected query conditional.
Merge branch 'hotfix/1.1-Fix-Query'