Add filters structure to template
Merge branch 'add/filters' into development