Issue #3311431 by joao.ramos, venugopp: Possible regression introduced with filter criteria improvement