Ensure filename is always returned for attachments