Filter predicate overhaul