diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb
index ac57b7bf..7c638f5c 100644
--- a/app/models/dmsf_link.rb
+++ b/app/models/dmsf_link.rb
@@ -105,7 +105,7 @@ class DmsfLink < ActiveRecord::Base
     if target_type == DmsfFile.model_name.to_s
       path = target_file.dmsf_path.map { |element| element.is_a?(DmsfFile) ? element.display_name : element.title }.join('/') if target_file
     else
-      path = target_folder ? target_folder.dmsf_path_str : ''
+      path = target_folder ? target_folder.dmsf_path_str : +''
     end
     path.insert(0, "#{target_project.name}:") if project_id != target_project_id
     if path && path.length > 50
diff --git a/app/views/dmsf/_url.html.erb b/app/views/dmsf/_url.html.erb
index bfc7e52d..9f40e175 100644
--- a/app/views/dmsf/_url.html.erb
+++ b/app/views/dmsf/_url.html.erb
@@ -40,7 +40,6 @@
         <%= link.external_url %>
       <% end %>
     </div>
-    <%= '</span>'.html_safe if @tree_view %>
   </td>
 <% end %>
 <% if DmsfFolder.is_column_on?('extension') %>
diff --git a/assets/javascripts/redmine_dmsf.js b/assets/javascripts/redmine_dmsf.js
index 0be480d8..d3362c07 100644
--- a/assets/javascripts/redmine_dmsf.js
+++ b/assets/javascripts/redmine_dmsf.js
@@ -247,10 +247,7 @@ function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl)
                 list.attr('aria-pressed', 'false');
                 list.removeClass('ui-checkboxradio-radio-label ui-checkboxradio-checked ui-state-active ui-controlgroup-item ui-checkboxradio-label');
                 list.addClass('ui-button-icon-only ui-state-default ui-corner-left');
-                list.html(`
-                    <span class="ui-button-text">List</span>
-                    <span class="ui-button-icon-secondary ui-icon ui-icon-grip-dotted-horizontal"></span>
-                `)
+                list.html("<span class='ui-button-text'>List</span><span class='ui-button-icon-secondary ui-icon ui-icon-grip-dotted-horizontal'></span>");
                 list.click(function () {
                     dmsf_plupload_toggle(list, thumbs);
                 });
@@ -262,10 +259,7 @@ function initPlUploader(uploader, formUrl, maxFileSize, maxFileCount, flashUrl)
                 thumbs.attr('aria-pressed', 'true');
                 thumbs.removeClass('ui-checkboxradio-radio-label ui-checkboxradio-checked ui-controlgroup-item ui-checkboxradio-label');
                 thumbs.addClass('ui-button-icon-only ui-corner-right');
-                thumbs.html(`
-                    <span class="ui-button-text">Thumbnails</span>
-                    <span class="ui-button-icon-secondary ui-icon ui-icon-image"></span>
-                `)
+                thumbs.html("<span class='ui-button-text'>Thumbnails</span><span class='ui-button-icon-secondary ui-icon ui-icon-image'></span>");
                 thumbs.click(function () {
                     dmsf_plupload_toggle(thumbs, list);
                 });