Fix the encounter query evaluators to use the hql query builder