Added urlencoding of file name