Update Person and cohort queries to use hql query builder or sql query builder if possible