Merge pull request #83 from wmathurin/unstable20

Support for query more (added by Akhilesh)