Fixed more problems
Merge branch 'feature-Category&Filter' of https://github.com/Tommzy/wpi-suite into feature-Category&Filter