Tweak categories handling, fix space-comma-space