Edit filters to be more readable and easier to define#18

JooNiv merged 7 commits intorewrite/mainFiQCI/dev:rewrite/mainfrom

refine-filtersFiQCI/dev:refine-filtersCopy head branch name to clipboard