Fix categories not to contain `,`