fix filter bug
Merge branch 'work'