Integrated changes in the QueryBuilder