Fix the obs query evaluators to use the hql query builder