Merge cleanup
Fix empty filter input handling
Merge branch 'master' of https://github.com/Eyescale/hwsd