removed unused code
made Query() behave more like other methods