Also fix query server
Merge pull request #2 from tgk/patch-2

Also fix query server