bugfix queries 2d and added query server