refactored the QueryGenerator
don't include method chaining in actual Query objects