Fixed type and category label handling