diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/topic_search_index_mapping.py b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/topic_search_index_mapping.py
index d08df31dc5b..84eb0ea1a80 100644
--- a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/topic_search_index_mapping.py
+++ b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/topic_search_index_mapping.py
@@ -88,6 +88,9 @@ TOPIC_ELASTICSEARCH_INDEX_MAPPING = textwrap.dedent(
             "type": "keyword",
             "normalizer": "lowercase_normalizer"
           },
+          "schemaText": {
+            "type": "text"
+          },
           "schemaFields": {
             "properties": {
               "name": {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/MlModelIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/MlModelIndex.java
index 6f407885b5c..56a330d6c73 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/MlModelIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/MlModelIndex.java
@@ -9,6 +9,7 @@ import org.openmetadata.service.util.JsonUtils;
 
 public class MlModelIndex implements ElasticSearchIndex {
   final MlModel mlModel;
+  final List<String> excludeFields = List.of("changeDescription");
 
   public MlModelIndex(MlModel mlModel) {
     this.mlModel = mlModel;
@@ -17,6 +18,7 @@ public class MlModelIndex implements ElasticSearchIndex {
   public Map<String, Object> buildESDoc() {
     Map<String, Object> doc = JsonUtils.getMap(mlModel);
     List<ElasticSearchSuggest> suggest = new ArrayList<>();
+    ElasticSearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
     suggest.add(ElasticSearchSuggest.builder().input(mlModel.getFullyQualifiedName()).weight(5).build());
     suggest.add(ElasticSearchSuggest.builder().input(mlModel.getName()).weight(10).build());
 
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/TopicIndex.java b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/TopicIndex.java
index 3768b0ae22d..e08058a3e44 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/TopicIndex.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/elasticsearch/TopicIndex.java
@@ -9,7 +9,7 @@ import org.openmetadata.service.Entity;
 import org.openmetadata.service.util.JsonUtils;
 
 public class TopicIndex implements ElasticSearchIndex {
-  final List<String> excludeTopicFields = List.of("sampleData");
+  final List<String> excludeTopicFields = List.of("sampleData", "changeDescription");
   final Topic topic;
 
   public TopicIndex(Topic topic) {
diff --git a/openmetadata-service/src/main/resources/elasticsearch/topic_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/topic_index_mapping.json
index a2d6e04c46e..781f3ea12c7 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/topic_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/topic_index_mapping.json
@@ -72,6 +72,9 @@
             "type": "keyword",
             "normalizer": "lowercase_normalizer"
           },
+          "schemaText": {
+            "type": "text"
+          },
           "schemaFields": {
             "properties": {
               "name": {