diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb
index d8656a18..fc12b0da 100644
--- a/app/controllers/dmsf_links_controller.rb
+++ b/app/controllers/dmsf_links_controller.rb
@@ -46,7 +46,7 @@ class DmsfLinksController < ApplicationController
 
   def new
     @dmsf_link = DmsfLink.new
-    member = Member.find_by_project_id_and_user_id(params[:project_id], User.current.id)
+    member = Member.find_by(project_id: params[:project_id], user_id: User.current.id)
     @fast_links = member && member.dmsf_fast_links
     @dmsf_link.project_id = params[:project_id]
     @dmsf_link.dmsf_folder_id = params[:dmsf_folder_id]
@@ -121,7 +121,7 @@ class DmsfLinksController < ApplicationController
       if params[:dmsf_link][:target_project_id].present?
         @dmsf_link.project_id = params[:dmsf_link][:target_project_id]
       else
-        target_folder = DmsfFolder.find_by_id(params[:dmsf_link][:target_folder_id])
+        target_folder = DmsfFolder.find_by(id: params[:dmsf_link][:target_folder_id])
         unless target_folder
           render_404
           return
diff --git a/app/views/dmsf_links/_form.html.erb b/app/views/dmsf_links/_form.html.erb
index 82116078..3d281f8d 100644
--- a/app/views/dmsf_links/_form.html.erb
+++ b/app/views/dmsf_links/_form.html.erb
@@ -50,7 +50,7 @@
           <%= late_javascript_tag do %>
               $('#dmsf_link_target_project_id').change(function(){
                 $.ajax({
-                  url: '<%= autocomplete_for_project_dmsf_link_path(@project, :format => 'js') %>',
+                  url: '<%= escape_javascript autocomplete_for_project_dmsf_link_path(@project, :format => 'js') %>',
                   type: 'get',
                   data: $('#new_dmsf_link').serialize()
                 });
@@ -70,14 +70,14 @@
             <%= text_field_tag 'dmsf_link[target_folder_id]', '', :required => true, :max_length => 255 %>
           <% end %>
         <% end %>
-        <% unless @fast_links && (@type == 'link_to') %>
+        <% if !@fast_links || (@type != 'link_to') %>
           <%= select_tag('dmsf_link[target_folder_id]',
             folder_tree_options_for_select(DmsfFolder.directory_tree(@dmsf_link.target_project),
             :selected => @target_folder_id)) %>
           <%= late_javascript_tag do %>
               $('#dmsf_link_target_folder_id').change(function(){
                 $.ajax({
-                  url: '<%= autocomplete_for_folder_dmsf_link_path(@project, :format => 'js') %>',
+                  url: '<%= escape_javascript autocomplete_for_folder_dmsf_link_path(@project, :format => 'js') %>',
                   type: 'get',
                   data: $('#new_dmsf_link').serialize()
                 });
diff --git a/db/migrate/20180903132101_fast_links.rb b/db/migrate/20180903132101_fast_links.rb
index 72b2af35..0733fcfa 100644
--- a/db/migrate/20180903132101_fast_links.rb
+++ b/db/migrate/20180903132101_fast_links.rb
@@ -21,7 +21,6 @@
 class FastLinks < ActiveRecord::Migration
   def self.up
     add_column :members, :dmsf_fast_links, :boolean, :default => false, :null => false
-    Member.update_all(:dmsf_fast_links => false)
   end
 
   def self.down