refactor predicate order