QueryBuilder updates