applied filter also to maintain view
Merge branch 'dev'