Add ability to get filenames attached and fix so that Keys.encode doesnt corrupt the filenames sent