Tweaked how filenames are returned and sent