Merge pull request #24 from baotran109/master

fix filter
fix js