Refactor filtering code

[Withalion]

This issue encapsulates work started in #4454. The work needs to be rebased on release version of filtering and problematic areas can be found in the PR.