#24: rework filters