Report Grouping

Mostly love the new report interface - including grouping, but I don't love what's it's doing to my client name when I group. See example below. Is anyone else having this problem? It doesn't handle apostrophes or ampersands properly. Other than renaming my client, is there a solution to this issue?