WP-2844 Added grouping for the categories