fix issue with filtering
Merge branch 'fix-filter-bug' into dev