mini fix filter
Merge branch 'fix-filter' into develop