Quick query builder fix