Add filter and fix bugs #3
Add filter and fix bugs #3