Make categories format consistent, case #22