GEP-37 Added display for attachments