QueryBuilder small changes