use PoolFilterBuilder to replace some CriteriaRules code

I forgot to delete this bit in a branch last week...