diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/ContainerIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/ContainerIndex.java
index 8bfb602fa74..17ccc187702 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/ContainerIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/ContainerIndex.java
@@ -3,7 +3,9 @@ package org.openmetadata.service.elasticsearch.indexes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.data.Container;
+import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.service.Entity;
 import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
 import org.openmetadata.service.elasticsearch.ParseTags;
@@ -21,6 +23,11 @@ public class ContainerIndex implements ColumnIndex {
   }
 
   public Map<String, Object> buildESDoc() {
+    if (container.getOwner() != null) {
+      EntityReference owner = container.getOwner();
+      owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
+      container.setOwner(owner);
+    }
     Map<String, Object> doc = JsonUtils.getMap(container);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
     List<ElasticSearchSuggest> columnSuggest = new ArrayList<>();
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/DashboardIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/DashboardIndex.java
index 464c88c11b3..2862799f7c8 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/DashboardIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/DashboardIndex.java
@@ -5,6 +5,7 @@ import static org.openmetadata.common.utils.CommonUtil.listOrEmpty;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.data.Dashboard;
 import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.service.Entity;
@@ -22,6 +23,11 @@ public class DashboardIndex implements ElasticSearchIndex {
   }
 
   public Map<String, Object> buildESDoc() {
+    if (dashboard.getOwner() != null) {
+      EntityReference owner = dashboard.getOwner();
+      owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
+      dashboard.setOwner(owner);
+    }
     Map<String, Object> doc = JsonUtils.getMap(dashboard);
     ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/GlossaryTermIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/GlossaryTermIndex.java
index ad8b1decfb7..8ba3eb0fce6 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/GlossaryTermIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/GlossaryTermIndex.java
@@ -3,7 +3,9 @@ package org.openmetadata.service.elasticsearch.indexes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.data.GlossaryTerm;
+import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.service.Entity;
 import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
 import org.openmetadata.service.elasticsearch.models.ElasticSearchSuggest;
@@ -18,6 +20,11 @@ public class GlossaryTermIndex implements ElasticSearchIndex {
   }
 
   public Map<String, Object> buildESDoc() {
+    if (glossaryTerm.getOwner() != null) {
+      EntityReference owner = glossaryTerm.getOwner();
+      owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
+      glossaryTerm.setOwner(owner);
+    }
     Map<String, Object> doc = JsonUtils.getMap(glossaryTerm);
     ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/MlModelIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/MlModelIndex.java
index 1e11fbef7fb..4db9d093a65 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/MlModelIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/MlModelIndex.java
@@ -3,7 +3,9 @@ package org.openmetadata.service.elasticsearch.indexes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.data.MlModel;
+import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.service.Entity;
 import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
 import org.openmetadata.service.elasticsearch.ParseTags;
@@ -19,6 +21,11 @@ public class MlModelIndex implements ElasticSearchIndex {
   }
 
   public Map<String, Object> buildESDoc() {
+    if (mlModel.getOwner() != null) {
+      EntityReference owner = mlModel.getOwner();
+      owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
+      mlModel.setOwner(owner);
+    }
     Map<String, Object> doc = JsonUtils.getMap(mlModel);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
     ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/PipelineIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/PipelineIndex.java
index ae383ea9de5..7026cf65b0c 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/PipelineIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/PipelineIndex.java
@@ -3,7 +3,9 @@ package org.openmetadata.service.elasticsearch.indexes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.data.Pipeline;
+import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.schema.type.Task;
 import org.openmetadata.service.Entity;
 import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
@@ -20,6 +22,11 @@ public class PipelineIndex implements ElasticSearchIndex {
   }
 
   public Map<String, Object> buildESDoc() {
+    if (pipeline.getOwner() != null) {
+      EntityReference owner = pipeline.getOwner();
+      owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
+      pipeline.setOwner(owner);
+    }
     Map<String, Object> doc = JsonUtils.getMap(pipeline);
     ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TableIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TableIndex.java
index 0bffad14ddf..e5dea8b60a2 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TableIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TableIndex.java
@@ -4,7 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.data.Table;
+import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.service.Entity;
 import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
 import org.openmetadata.service.elasticsearch.ParseTags;
@@ -28,6 +30,11 @@ public class TableIndex implements ColumnIndex {
   }
 
   public Map<String, Object> buildESDoc() {
+    if (table.getOwner() != null) {
+      EntityReference owner = table.getOwner();
+      owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
+      table.setOwner(owner);
+    }
     Map<String, Object> doc = JsonUtils.getMap(table);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
     List<ElasticSearchSuggest> columnSuggest = new ArrayList<>();
@@ -35,7 +42,6 @@ public class TableIndex implements ColumnIndex {
     List<ElasticSearchSuggest> databaseSuggest = new ArrayList<>();
     List<ElasticSearchSuggest> serviceSuggest = new ArrayList<>();
     ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
-
     if (table.getColumns() != null) {
       List<FlattenColumn> cols = new ArrayList<>();
       parseColumns(table.getColumns(), cols, null);
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TeamIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TeamIndex.java
index e3bf52e1046..d3bcd8564a3 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TeamIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TeamIndex.java
@@ -3,6 +3,7 @@ package org.openmetadata.service.elasticsearch.indexes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.teams.Team;
 import org.openmetadata.service.Entity;
 import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
@@ -18,7 +19,7 @@ public class TeamIndex implements ElasticSearchIndex {
   }
 
   public Map<String, Object> buildESDoc() {
-    if (team.getDisplayName() == null) {
+    if (CommonUtil.nullOrEmpty(team.getDisplayName())) {
       team.setDisplayName(team.getName());
     }
     Map<String, Object> doc = JsonUtils.getMap(team);
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TopicIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TopicIndex.java
index d60be6b89d0..8a35aaec7f0 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TopicIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/TopicIndex.java
@@ -5,7 +5,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.data.Topic;
+import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.schema.type.Field;
 import org.openmetadata.schema.type.TagLabel;
 import org.openmetadata.service.Entity;
@@ -25,6 +27,11 @@ public class TopicIndex implements ElasticSearchIndex {
   }
 
   public Map<String, Object> buildESDoc() {
+    if (topic.getOwner() != null) {
+      EntityReference owner = topic.getOwner();
+      owner.setDisplayName(CommonUtil.nullOrEmpty(owner.getDisplayName()) ? owner.getName() : owner.getDisplayName());
+      topic.setOwner(owner);
+    }
     Map<String, Object> doc = JsonUtils.getMap(topic);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
     List<ElasticSearchSuggest> fieldSuggest = new ArrayList<>();
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/UserIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/UserIndex.java
index 65f9fea668d..b1c847a09b5 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/UserIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/indexes/UserIndex.java
@@ -3,6 +3,7 @@ package org.openmetadata.service.elasticsearch.indexes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openmetadata.common.utils.CommonUtil;
 import org.openmetadata.schema.entity.teams.User;
 import org.openmetadata.service.Entity;
 import org.openmetadata.service.elasticsearch.ElasticSearchIndexUtils;
@@ -18,7 +19,7 @@ public class UserIndex implements ElasticSearchIndex {
   }
 
   public Map<String, Object> buildESDoc() {
-    if (user.getDisplayName() == null) {
+    if (CommonUtil.nullOrEmpty(user.getDisplayName())) {
       user.setDisplayName(user.getName());
     }
     if (user.getIsBot() == null) {