fixes for harvester and new original file name format