refactor to create find predicates