diff --git a/app/datatables/repository_datatable.rb b/app/datatables/repository_datatable.rb
index f2d7ecb4f..7ca2f07c0 100644
--- a/app/datatables/repository_datatable.rb
+++ b/app/datatables/repository_datatable.rb
@@ -191,12 +191,9 @@ class RepositoryDatatable < AjaxDatatablesRails::Base
     search_val = params[:search][:value]
 
     filtered_ids = RepositoryRow.select do |r|
-      [r.name, r.created_at.to_s, r.created_by.full_name].any? do |s|
-        s.include?(search_val)
-      end ||
-        r.repository_cells.map do |c|
-          c.value.data.include?(search_val)
-        end.any?
+      row_cells = [r.name, r.created_at.to_s, r.created_by.full_name]
+      row_cells.push(*r.repository_cells.collect { |c| c.value.data })
+      row_cells.any? { |c| c.include?(search_val) }
     end
     records.where!(id: filtered_ids)
   end