Fix handling categorization changes