Renamed QueryObect to QueryInfo plus simplifications