Fix and test broken category support