CORE-324 filter structure is recoded so it can be aligned with tree items
Merge pull request #1915 from reciprocity/feature/filter-restructure

CORE-324 filter structure is recoded so it can be aligned with tree item...