[Finishes #54164738]
Merge pull request #3 from tomzabek/feature/filters_54164738

[Finishes #54164738]