adjusting queries
Merge branch 'master' into labels