More refactoring in reports for subgroups.