Updated the filter classes to better match our needs.
Merge branch 'master' of https://github.com/scanniza/DesktopHipster