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

Filter structure is recoded so it can be aligned with tree items