Simplified the QueryBuilderHelper