Enhance queryBuilder