Bug fix + cleanups in filter.
Merge branch 'master' into gh-pages