diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/TeamIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/TeamIndex.java
index 8affae14256..3c861a565da 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/TeamIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/TeamIndex.java
@@ -9,21 +9,21 @@ import org.openmetadata.service.util.JsonUtils;
 
 public class TeamIndex implements ElasticSearchIndex {
   final Team team;
-  final List<String> excludeFields = List.of("owns", "changeDescription", "roles", "inheritedRoles");
+  final List<String> excludeFields = List.of("owns", "changeDescription");
 
   public TeamIndex(Team team) {
     this.team = team;
   }
 
   public Map<String, Object> buildESDoc() {
+    if (team.getDisplayName() == null) {
+      team.setDisplayName(team.getName());
+    }
     Map<String, Object> doc = JsonUtils.getMap(team);
     ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
     suggest.add(ElasticSearchSuggest.builder().input(team.getName()).weight(5).build());
     suggest.add(ElasticSearchSuggest.builder().input(team.getDisplayName()).weight(10).build());
-    if (team.getDisplayName() == null) {
-      doc.put("displayName", team.getName());
-    }
     doc.put("suggest", suggest);
     doc.put("entityType", Entity.TEAM);
     return doc;
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/UserIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/UserIndex.java
index ae37c6d6587..35debc74767 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/UserIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/UserIndex.java
@@ -9,21 +9,21 @@ import org.openmetadata.service.util.JsonUtils;
 
 public class UserIndex implements ElasticSearchIndex {
   final User user;
-  final List<String> excludeFields = List.of("owns", "changeDescription", "follows");
+  final List<String> excludeFields = List.of("owns", "changeDescription", "follows", "authenticationMechanism");
 
   public UserIndex(User user) {
     this.user = user;
   }
 
   public Map<String, Object> buildESDoc() {
+    if (user.getDisplayName() == null) {
+      user.setDisplayName(user.getName());
+    }
     Map<String, Object> doc = JsonUtils.getMap(user);
     ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
     suggest.add(ElasticSearchSuggest.builder().input(user.getName()).weight(5).build());
     suggest.add(ElasticSearchSuggest.builder().input(user.getDisplayName()).weight(10).build());
-    if (user.getDisplayName() == null) {
-      doc.put("displayName", user.getName());
-    }
     doc.put("suggest", suggest);
     doc.put("entityType", Entity.USER);
     return doc;
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java
index 7ba77ee1f5e..ad047b32fae 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/search/SearchResource.java
@@ -570,13 +570,13 @@ public class SearchResource {
 
   private SearchSourceBuilder buildUserSearchBuilder(String query, int from, int size) {
     QueryStringQueryBuilder queryBuilder =
-        QueryBuilders.queryStringQuery(query).field(NAME, 5.0f).field(DISPLAY_NAME, 1.0f).lenient(true);
+        QueryBuilders.queryStringQuery(query).field(DISPLAY_NAME, 5.0f).field(NAME, 3.0f).lenient(true);
     return searchBuilder(queryBuilder, null, from, size);
   }
 
   private SearchSourceBuilder buildTeamSearchBuilder(String query, int from, int size) {
     QueryStringQueryBuilder queryBuilder =
-        QueryBuilders.queryStringQuery(query).field(NAME, 5.0f).field(DISPLAY_NAME, 3.0f).lenient(true);
+        QueryBuilders.queryStringQuery(query).field(DISPLAY_NAME, 5.0f).field(NAME, 3.0f).lenient(true);
     return searchBuilder(queryBuilder, null, from, size);
   }
 
diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json
index 78c5d5cfc1f..6e9c4de9fa1 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json
@@ -17,7 +17,7 @@
         "type": "text"
       },
       "displayName": {
-        "type": "keyword",
+        "type": "text",
         "fields": {
           "keyword": {
             "type": "keyword",
diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json
index 295f01e77fe..c6d156fb4b9 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json
@@ -17,7 +17,7 @@
         "type": "text"
       },
       "displayName": {
-        "type": "keyword",
+        "type": "text",
         "fields": {
           "keyword": {
             "type": "keyword",