Modify ObsDataEvaluators to use new QueryBuilders