Fix handling of subgroups per #16

Merge request reports

Loading