Query filter fix
Merge branch 'develop'