Add predicate support for all filters on filter-ref