fixed bug
Merge branch 'new_filters' into develop