query all works
Merge branch 'query'