Refactoring the way that predicates are fetched due to a bag in parsing