Fixed edge cases when reaching the end of a folder
Added attachments to collected data