Moved filters into a separate file
Merge branch 'filters'