REPORT-698 - Refactor SqlIndicatorEvaluator to use SqlQueryBuilder