1 files changed, 6 insertions, 1 deletions
diff --git a/app/client/dataset/dataset.loader.js b/app/client/dataset/dataset.loader.js
index f068bdb..3887e69 100644
--- a/app/client/dataset/dataset.loader.js
+++ b/app/client/dataset/dataset.loader.js
@@ -74,7 +74,12 @@ export const load = module => {
     ungeneratedFiles.reduce((datasetLookup, file) => {
       fileLookup[file.id] = file
       if (! file.name) {
-        file.name = (file.opt || {}).token || file.url
+        if (file.opt && file.opt.media && file.opt.media.token) {
+          file.name = file.opt.media.token
+        }
+        else {          
+          file.name = file.url.replace(/^https?:\/\/(www.)?/,'').replace(/[^a-zA-Z0-9_]/g, '_').replace(/_+/g, '_') || 'unknown_' + Math.floor(1000*Math.random())
+        }
       }
       const name = (file.name || 'unsorted').split('.')[0]
       const folder = folderLookup[file.folder_id] || unsortedFolder(module)