Enhance query builder