InclusionFilter works with single values and arrays.
Refactor UI state getters.
Merge branch 'UI'