Improved filters
Merge branch 'feature/178'