WKS-245: Make it possible to don't expose one of the filters
Merge remote-tracking branch 'origin/feature/WKS-245' into develop