diff --git a/app/helpers/dmsf_queries_helper.rb b/app/helpers/dmsf_queries_helper.rb
index 9a04ba42..791aa7dc 100644
--- a/app/helpers/dmsf_queries_helper.rb
+++ b/app/helpers/dmsf_queries_helper.rb
@@ -49,26 +49,46 @@ module DmsfQueriesHelper
         content_tag(:span, '', class: 'icon icon-none')
     when :id
       case item.type
-      when 'file', 'file-link'
+      when 'file'
         if item&.deleted > 0
-          super column, item, value
+          h(value)
         else
           link_to h(value), dmsf_file_path(id: item.id)
         end
-      when 'folder', 'folder-link'
+      when 'file-link'
+        if item&.deleted > 0
+          h(item.revision_id)
+        else
+          link_to h(item.revision_id), dmsf_file_path(id: item.revision_id)
+        end
+      when 'folder'
         if item.id
           if item&.deleted > 0
-            super column, item, value
+            h(value)
           else
             link_to h(value), edit_dmsf_path(id: item.project_id, folder_id: item.id)
           end
         else
           if item&.deleted > 0
-            super column, item, item.project_id
+            h(item.project_id)
           else
             link_to h(item.project_id), edit_root_dmsf_path(id: item.project_id)
           end
-         end
+        end
+      when 'folder-link'
+        if item.id
+          if item&.deleted > 0
+            h(item.revision_id)
+          else
+            link_to h(item.revision_id), edit_dmsf_path(id: item.project_id, folder_id: item.revision_id)
+          end
+        else
+          if item&.deleted > 0
+            h(item.project_id)
+          else
+            link_to h(item.project_id), edit_root_dmsf_path(id: item.project_id)
+          end
+        end
       else
         h(value)
       end
diff --git a/app/models/dmsf_query.rb b/app/models/dmsf_query.rb
index 25ca9894..3f98bb06 100644
--- a/app/models/dmsf_query.rb
+++ b/app/models/dmsf_query.rb
@@ -172,9 +172,8 @@ class DmsfQuery < Query
       DmsfFileRevisionCustomField.visible.pluck(:id, :name).each do |id, name|
         order_option[1].gsub!("COALESCE(cf_#{id}.value, '')", "cf_#{id}")
       end
-      order_option[1].gsub!(',', " #{$1},")
       if order_option[1] =~ /(DESC|ASC)$/
-        order_option[1].gsub!(',', " #{$1},")
+         order_option[1].gsub!(',', " #{$1},")
       end
     end