diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index eafee699d..57d0ba4d3 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -335,7 +335,20 @@ var RepositoryDatatable = (function(global) {
           appendInput(form, rowId, 'row_ids[]');
         });
       }
-    });
+    })
+      .on('ajax:beforeSend', function() {
+        animateSpinner(null, true);
+      })
+      .on('ajax:complete', function() {
+        $('#exportRepositoryModal').modal('hide');
+        animateSpinner(null, false);
+      })
+      .on('ajax:success', function(ev, data) {
+        HelperModule.flashAlertMsg(data.message, 'success');
+      })
+      .on('ajax:error', function(ev, data) {
+        HelperModule.flashAlertMsg(data.responseJSON.message, 'danger');
+      });
   }
 
   function disableCheckboxToggleOnAssetDownload() {
diff --git a/app/controllers/zip_exports_controller.rb b/app/controllers/zip_exports_controller.rb
index bc0eb85c4..ef9bfb7eb 100644
--- a/app/controllers/zip_exports_controller.rb
+++ b/app/controllers/zip_exports_controller.rb
@@ -22,6 +22,6 @@ class ZipExportsController < ApplicationController
 
   def load_var
     @zip_export = current_user.zip_exports.find_by_id(params[:id])
-    redirect_to(file_expired_url, status: 301) and return unless @zip_export&.zip_file&.exists?
+    redirect_to(file_expired_url, status: :moved_permanently) and return unless @zip_export&.zip_file&.attached?
   end
 end
diff --git a/app/services/spreadsheet_parser.rb b/app/services/spreadsheet_parser.rb
index 9549eec13..bfb9745fb 100644
--- a/app/services/spreadsheet_parser.rb
+++ b/app/services/spreadsheet_parser.rb
@@ -3,8 +3,13 @@
 class SpreadsheetParser
   # Based on file's extension opens file (used for importing)
   def self.open_spreadsheet(file)
-    filename = file.original_filename
-    file_path = file.path
+    if file.class == ActionDispatch::Http::UploadedFile
+      filename = file.original_filename
+      file_path = file.path
+    else
+      filename = file.filename.to_s
+      file_path = file.service_url
+    end
 
     case File.extname(filename)
     when '.csv'