Added compatability with long names and special names in image file names on server