This is part of the filter refactoring (DBZ-1433) generally speaking, but I'm logging this here separately, as it's a rather isolated task which should be resolvable rather quickly.