Search and filters work again
Fixes to filters and demo contents for subcategories