fix filters hierarchy
Merge branch 'feature/filters_extra' into develop