KRACOEUS-7828

- Code updates to fix KRACOEUS-7828
Is this extra grouping correct for the Attachments Page?