diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json
index ef1afa9c32c8..b4072029cb34 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json
@@ -572,7 +572,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json
index 1d21ba2f2f18..76d5ce0da714 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_resolution_status_index_mapping.json
@@ -458,7 +458,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json
index 94ab0f44b71c..4c72ce02d737 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_result_index_mapping.json
@@ -421,6 +421,16 @@
           "id": {
             "type": "keyword",
             "ignore_above": 256
+          },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
           }
         }
       },
@@ -429,6 +439,16 @@
           "id": {
             "type": "keyword",
             "ignore_above": 256
+          },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
           }
         }
       }
diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json
index c3e1b642f42f..7aeb913c28f3 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json
@@ -369,7 +369,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
@@ -439,6 +439,10 @@
             "type": "text"
           }
         }
+      },
+      "serviceType": {
+        "type": "keyword",
+        "normalizer": "lowercase_normalizer"
       }
     }
   }
diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json
index 3e23909ab680..6546310d12c2 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json
@@ -578,7 +578,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json
index ef4f071de7ba..625e736ee440 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_resolution_status_index_mapping.json
@@ -466,7 +466,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json
index af81421eeb5f..2454a2a9479d 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_result_index_mapping.json
@@ -410,6 +410,58 @@
             "type": "text"
           }
         }
+      },
+      "table": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "service": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "databaseSchema": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256
+          },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
+          }
+        }
+      },
+      "database": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256
+          },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
+          }
+        }
       }
     }
   },
diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json
index 4c50de84c349..d917ad1884aa 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json
@@ -348,7 +348,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
@@ -419,6 +419,10 @@
           }
         }
       },
+      "serviceType": {
+        "type": "keyword",
+        "normalizer": "lowercase_normalizer"
+      },
       "totalVotes": {
         "type": "long",
         "null_value": 0
diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json
index 19f5f4578589..03c7f4f98027 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json
@@ -580,7 +580,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json
index 2bb62965df72..2abd2d252209 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_resolution_status_index_mapping.json
@@ -456,7 +456,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json
index fa818f714ee7..43954c380121 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_result_index_mapping.json
@@ -407,6 +407,68 @@
             "type": "text"
           }
         }
+      },
+      "table": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256
+          },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
+          }
+        }
+      },
+      "service": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "databaseSchema": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256
+          },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
+          }
+        }
+      },
+      "database": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256
+          },
+          "displayName": {
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "normalizer": "lowercase_normalizer",
+                "ignore_above": 256
+              }
+            }
+          }
+        }
       }
     }
   },
diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json
index b5dead0296fd..ade84c34c151 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json
@@ -337,7 +337,7 @@
             }
           },
           "displayName": {
-            "type": "text",
+            "type": "keyword",
             "fields": {
               "keyword": {
                 "type": "keyword",
@@ -408,6 +408,10 @@
           }
         }
       },
+      "serviceType": {
+        "type": "keyword",
+        "normalizer": "lowercase_normalizer"
+      },
       "totalVotes": {
         "type": "long",
         "null_value": 0