ENG-4848 Handle empty predicates to avoid excess eval's