hotfix for filters
Merge branch 'development'