fixes in handling file name with special characters