Feature/category pages

fixed map filtering on subclasses