Added filter to attachments