Fixed query.
Merge branch 'hotfix/1.2.4-Query'