Fixed export to have filename as the actual saved file name