[FOLLOWUP][TASK] Refactor queryBuilder usage