diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index a8b34329..021391a7 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -122,18 +122,12 @@ class DmsfController < ApplicationController
 
     if selected_dir_links.present? &&
       (params[:email_entries].present? || params[:download_entries].present?)
-        selected_dir_links.each do |id|
-          target_id = DmsfLink.find_by(id: id).pluck(:target_id).first
-          selected_folders << target_id if target_id && !selected_folders.include?(target_id)
-      end
+        selected_folders = DmsfLink.where(id: selected_dir_links).pluck(:target_id) | selected_folders
     end
 
     if selected_file_links.present? &&
       (params[:email_entries].present? || params[:download_entries].present?)
-        selected_file_links.each do |id|
-          target_id = DmsfLink.find_by(id: id).pluck(:target_id).first
-          selected_files << target_id if target_id && !selected_files.include?(target_id)
-      end
+        selected_files = DmsfLink.where(id: selected_file_links).pluck(:target_id) | selected_files
     end
 
     begin
diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb
index d0f3540b..505d1bf8 100644
--- a/app/controllers/dmsf_workflows_controller.rb
+++ b/app/controllers/dmsf_workflows_controller.rb
@@ -249,7 +249,7 @@ class DmsfWorkflowsController < ApplicationController
     if params[:dmsf_workflow] && params[:dmsf_workflow][:name].present?
       @dmsf_workflow.name = params[:dmsf_workflow][:name]
     elsif params[:dmsf_workflow] && params[:dmsf_workflow][:id].present?
-      names = DmsfWorkflow.find_by(id: params[:dmsf_workflow][:id]).pluck(:name)
+      names = DmsfWorkflow.where(id: params[:dmsf_workflow][:id]).pluck(:name)
       @dmsf_workflow.name = names.first
     end
 
diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb
index e385f1dc..cd5c08fb 100644
--- a/app/models/dmsf_file_revision.rb
+++ b/app/models/dmsf_file_revision.rb
@@ -224,7 +224,7 @@ class DmsfFileRevision < ActiveRecord::Base
   def workflow_str(name)
     str = ''
     if name && dmsf_workflow_id
-      names = DmsfWorkflow.find_by(id: dmsf_workflow_id).pluck(:name)
+      names = DmsfWorkflow.where(id: dmsf_workflow_id).pluck(:name)
       str = "#{names.first} - " if names.any?
     end
     case workflow