Grouping issues

Maybe give a try with Dynamic Data Attachment as outlined in our support article: