diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json
index 3293aa035d28..f469274c5e7c 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json
@@ -17,6 +17,14 @@
             "lowercase",
             "om_stemmer"
           ]
+        },
+        "om_ngram": {
+          "tokenizer": "ngram",
+          "min_gram": 3,
+          "max_gram": 10,
+          "filter": [
+            "lowercase"
+          ]
         }
       },
       "filter": {
@@ -43,10 +51,13 @@
           }
         }
       },
+      "fullyQualifiedName": {
+        "type": "keyword",
+        "normalizer": "lowercase_normalizer"
+      },
       "displayName": {
         "type": "text",
         "analyzer": "om_analyzer",
-        "fields": {
         "fields": {
           "keyword": {
             "type": "keyword",
@@ -54,17 +65,26 @@
           }
         }
       },
-      "fullyQualifiedName": {
-        "type": "keyword",
-        "normalizer": "lowercase_normalizer"
+      "description": {
+        "type": "text",
+        "analyzer": "om_analyzer",
+        "index_options": "docs"
       },
       "fqnParts": {
         "type": "keyword"
       },
-      "description": {
-        "type": "text",
-        "index_options": "docs",
-        "analyzer": "om_analyzer"
+      "entityType": {
+        "type": "keyword"
+      },
+      "suggest": {
+        "type": "completion",
+        "contexts": [
+          {
+            "name": "deleted",
+            "type": "category",
+            "path": "deleted"
+          }
+        ]
       },
       "version": {
         "type": "float"
@@ -79,25 +99,12 @@
       "chartType": {
         "type": "text"
       },
-      "sourceUrl": {
-        "type": "keyword"
-      },
       "href": {
         "type": "text"
       },
-      "entityType": {
+      "sourceUrl": {
         "type": "keyword"
       },
-      "suggest": {
-        "type": "completion",
-        "contexts": [
-          {
-            "name": "deleted",
-            "type": "category",
-            "path": "deleted"
-          }
-        ]
-      },
       "owner": {
         "properties": {
           "id": {
@@ -127,6 +134,7 @@
             "fields": {
               "keyword": {
                 "type": "keyword",
+                "normalizer": "lowercase_normalizer",
                 "ignore_above": 256
               }
             }
@@ -146,46 +154,13 @@
         }
       },
       "followers": {
-        "properties": {
-          "id": {
-            "type": "keyword",
-            "fields": {
-              "keyword": {
-                "type": "keyword",
-                "ignore_above": 36
-              }
-            }
-          },
-          "type": {
-            "type": "keyword"
-          },
-          "name": {
-            "type": "keyword",
-            "fields": {
-              "keyword": {
-                "type": "keyword",
-                "ignore_above": 256
-              }
-            }
-          },
-          "fullyQualifiedName": {
-            "type": "text"
-          },
-          "description": {
-            "type": "text"
-          },
-          "deleted": {
-            "type": "text"
-          },
-          "href": {
-            "type": "text"
-          }
-        }
+        "type": "keyword"
       },
       "tags": {
         "properties": {
           "tagFQN": {
-            "type": "keyword"
+            "type": "keyword",
+            "normalizer": "lowercase_normalizer"
           },
           "labelType": {
             "type": "keyword"
@@ -224,6 +199,16 @@
               }
             }
           },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
+          },
           "fullyQualifiedName": {
             "type": "text"
           },
@@ -244,9 +229,6 @@
       "deleted": {
         "type": "text"
       },
-      "lifeCycle": {
-        "type": "object"
-      },
       "domain" : {
         "properties": {
           "id": {
@@ -270,6 +252,16 @@
               }
             }
           },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
+          },
           "fullyQualifiedName": {
             "type": "keyword"
           },
@@ -284,7 +276,10 @@
           }
         }
       },
-      "dataProducts" : {
+      "lifeCycle": {
+        "type": "object"
+      },
+      "dataProducts": {
         "properties": {
           "id": {
             "type": "keyword",