Added new field to make filters
Merge branch 'feature/filters'