Add support for viewing by subcategory and fix a view sets bug