diff --git a/app/models/client.rb b/app/models/client.rb
index 09c4b25d7..bf091dabb 100644
--- a/app/models/client.rb
+++ b/app/models/client.rb
@@ -128,7 +128,7 @@ def as_indexed_json(options={})
   end
 
   def self.query_fields
-    ['symbol^10', 'name^10', 'description^10', 'contact_name^10', 'contact_email^10', 'domains', 'url', 'software^3', 'repository.subjects.text^3', 'repository.certificates.text^3', '_all']
+    ['uid^10', 'symbol^10', 'name^5', 'description^5', 'contact_name^5', 'contact_email^5', 'domains', 'url', 'software^3', 'repository.subjects.text^3', 'repository.certificates.text^3', '_all']
   end
 
   def self.query_aggregations
diff --git a/app/models/provider.rb b/app/models/provider.rb
index 5cad5edc2..2e308c0b8 100644
--- a/app/models/provider.rb
+++ b/app/models/provider.rb
@@ -197,7 +197,7 @@ def as_indexed_json(options={})
   end
 
   def self.query_fields
-    ['symbol^10', 'name^10', 'contact_name^10', 'contact_email^10', '_all']
+    ['uid^10', 'symbol^10', 'name^5', 'contact_name^5', 'contact_email^5', '_all']
   end
 
   def self.query_aggregations