improve Filter.js: faster code
Merge branch 'master' into gh-pages