add custom filters
Merge branch 'develop'