Add multiple subcategories, fix a commafy bug