WP-2844 Added grouping for the categories
WP-2950: Do not convert spaces to hyphens.
WP-2950: Convert hyphens to spaces in arguments, but print hyphens in links.