diff --git a/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb b/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
index 04fdff87b..fc3a8eb59 100644
--- a/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
+++ b/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
@@ -8,7 +8,7 @@
   #kaj dela: .remove("\"") na stringih, sanitize_input ampak pokvari stran
    %>
 
-  <%= hidden_field_tag :banana, (@json_object['steps'][0]['components'][0]) %>
+  <%= hidden_field_tag :banana, (@json_object['steps']) %>
 
 
   <%# end %>
diff --git a/app/views/protocols/protocolsio_import_create.js.erb b/app/views/protocols/protocolsio_import_create.js.erb
index 9389beee8..8d8b03acf 100644
--- a/app/views/protocols/protocolsio_import_create.js.erb
+++ b/app/views/protocols/protocolsio_import_create.js.erb
@@ -1,6 +1,9 @@
 
 $('#modal-import-json-protocol').modal('hide');
-
-$('#protocolsio-preview-modal-target').html("<%= j(render(:partial => 'protocols/import_export/import_json_protocol_preview_modal')) %>")
+<% if remotipart_submitted? %>
+    $('#protocolsio-preview-modal-target').html("<%= j "#{render(:partial => 'protocols/import_export/import_json_protocol_preview_modal')}" %>");
+<% else %>
+    $('#protocolsio-preview-modal-target').html("<%= j render(:partial => 'protocols/import_export/import_json_protocol_preview_modal') %>");
+<% end %>
 
 $('#modal-import-json-protocol-preview').modal('show');