Filters fix

Let's try this for #3508 : purely theorical, will need tests first