Modify PersonDataEvaluators to use new QueryBuilders