REPORT-699 - Upgrade Sql Query Evaluators to use SqlQueryBuilder