Grouping of Communities by Care Home in Reports

We have just started implementing PCS and have setup communities to reflect the individual floors/units in two of the homes.

We have noticed in the group reporting section (for users that have access to multiple homes) that the communities are grouped alphabetically which means the unit communities are not grouped with the home they relate to (see screenshot), for example in our business the units Daisy, Daffodil and Rose are in the Park View care home.

It seems to us that the communities should be grouped by care home first and then alphabetically. Ideally, the drop down functionality in these reports should be total company, then care home, then unit.

I hope that makes sense but please contact me if you need further information or clarification.