Thank you very much.
I'm convinced, that reintroducing the filter as proposed above in the issue description, will fix the problem without causing any regression.