Updated to latest build system and libraries
Fixed not working Filters sub-categories