Image Upload: improve file name extraction