Fix accented character in folder name issue. Improve file name disambiguation.