More wiring on query builder