Fix subcategory assignment