diff --git a/salt/elasticsearch/templates/component/so/dtc-agent-mappings.json b/salt/elasticsearch/templates/component/so/dtc-agent-mappings.json
index 60e344946..a0ec531a7 100644
--- a/salt/elasticsearch/templates/component/so/dtc-agent-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-agent-mappings.json
@@ -12,6 +12,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -21,6 +24,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -30,6 +36,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -39,6 +48,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -48,6 +60,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
diff --git a/salt/elasticsearch/templates/component/so/dtc-base-mappings.json b/salt/elasticsearch/templates/component/so/dtc-base-mappings.json
index ff3b73792..aa89e8876 100644
--- a/salt/elasticsearch/templates/component/so/dtc-base-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-base-mappings.json
@@ -9,6 +9,9 @@
         "message": {
           "type": "match_only_text",
           "fields": {
+            "text": {
+              "type": "match_only_text"
+            },
             "keyword": {
               "type": "keyword"
             }
@@ -18,6 +21,9 @@
           "ignore_above": 1024,
           "type": "keyword",
           "fields": {
+            "text": {
+              "type": "match_only_text"
+            },
             "keyword": {
               "type": "keyword"
             }
diff --git a/salt/elasticsearch/templates/component/so/dtc-dns-mappings.json b/salt/elasticsearch/templates/component/so/dtc-dns-mappings.json
index d5a498669..ba60fb6a9 100644
--- a/salt/elasticsearch/templates/component/so/dtc-dns-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-dns-mappings.json
@@ -14,7 +14,10 @@
                   "ignore_above": 1024,
                   "type": "keyword",
                   "fields": {
- 		    "keyword": {
+                    "text": {
+                      "type": "match_only_text"
+                    },
+                    "keyword": {
                       "type": "keyword"
                     }
                   }
diff --git a/salt/elasticsearch/templates/component/so/dtc-ecs-mappings.json b/salt/elasticsearch/templates/component/so/dtc-ecs-mappings.json
index 521d4944f..347b9b5a8 100644
--- a/salt/elasticsearch/templates/component/so/dtc-ecs-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-ecs-mappings.json
@@ -12,6 +12,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
diff --git a/salt/elasticsearch/templates/component/so/dtc-event-mappings.json b/salt/elasticsearch/templates/component/so/dtc-event-mappings.json
index d3e577267..d0c2227ba 100644
--- a/salt/elasticsearch/templates/component/so/dtc-event-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-event-mappings.json
@@ -12,6 +12,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -20,6 +23,9 @@
             "created": {
               "type": "date",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -29,14 +35,20 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
-		  "type": "keyword"
- 		}
+                  "type": "keyword"
+                }
               }
             },
             "ingested": {
               "type": "date",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -45,7 +57,10 @@
             "module": {
               "ignore_above": 1024,
               "type": "keyword",
-	      "fields": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -55,6 +70,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -64,6 +82,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -73,6 +94,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
diff --git a/salt/elasticsearch/templates/component/so/dtc-file-mappings.json b/salt/elasticsearch/templates/component/so/dtc-file-mappings.json
index af090a0b0..0698dd978 100644
--- a/salt/elasticsearch/templates/component/so/dtc-file-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-file-mappings.json
@@ -12,6 +12,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -21,6 +24,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
diff --git a/salt/elasticsearch/templates/component/so/dtc-host-mappings.json b/salt/elasticsearch/templates/component/so/dtc-host-mappings.json
index 064ce850c..79a4eb682 100644
--- a/salt/elasticsearch/templates/component/so/dtc-host-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-host-mappings.json
@@ -12,15 +12,21 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
               }
             },
-	    "mac": {
+            "mac": {
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
diff --git a/salt/elasticsearch/templates/component/so/dtc-http-mappings.json b/salt/elasticsearch/templates/component/so/dtc-http-mappings.json
index 1b504900a..d51ebe195 100644
--- a/salt/elasticsearch/templates/component/so/dtc-http-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-http-mappings.json
@@ -14,6 +14,9 @@
                   "ignore_above": 1024,
                   "type": "keyword",
                   "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    },
                     "keyword": {
                       "type": "keyword"
                     }
@@ -23,6 +26,9 @@
                   "ignore_above": 1024,
                   "type": "keyword",
                   "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    },
                     "keyword": {
                       "type": "keyword"
                     }
diff --git a/salt/elasticsearch/templates/component/so/dtc-network-mappings.json b/salt/elasticsearch/templates/component/so/dtc-network-mappings.json
index b42fe9771..f8adccf28 100644
--- a/salt/elasticsearch/templates/component/so/dtc-network-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-network-mappings.json
@@ -12,6 +12,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -20,11 +23,14 @@
             "transport": {
               "ignore_above": 1024,
               "type": "keyword",
-	      "fields": {
-  		"keyword": {
-    		  "type": "keyword"
-  		}
-	      }
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
+                "keyword": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         }
diff --git a/salt/elasticsearch/templates/component/so/dtc-observer-mappings.json b/salt/elasticsearch/templates/component/so/dtc-observer-mappings.json
index bd7e7f3bd..181496fe4 100644
--- a/salt/elasticsearch/templates/component/so/dtc-observer-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-observer-mappings.json
@@ -11,7 +11,10 @@
             "name": {
               "ignore_above": 1024,
               "type": "keyword",
-	      "fields": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
diff --git a/salt/elasticsearch/templates/component/so/dtc-process-mappings.json b/salt/elasticsearch/templates/component/so/dtc-process-mappings.json
index 688aec92c..f0bf6c70b 100644
--- a/salt/elasticsearch/templates/component/so/dtc-process-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-process-mappings.json
@@ -20,7 +20,7 @@
               "type": "wildcard"
             }
           }
-	}
+        }
       }
     }
   }
diff --git a/salt/elasticsearch/templates/component/so/dtc-rule-mappings.json b/salt/elasticsearch/templates/component/so/dtc-rule-mappings.json
index d2df0127b..0d0bd8bd8 100644
--- a/salt/elasticsearch/templates/component/so/dtc-rule-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-rule-mappings.json
@@ -11,16 +11,22 @@
             "category": {
               "ignore_above": 1024,
               "type": "keyword",
-	      "fields": {
-  		"keyword": {
-    		  "type": "keyword"
-  		}
-	      }
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
+                "keyword": {
+                  "type": "keyword"
+                }
+              }
             },
             "name": {
               "ignore_above": 1024,
               "type": "keyword",
-	      "fields": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
diff --git a/salt/elasticsearch/templates/component/so/dtc-service-mappings.json b/salt/elasticsearch/templates/component/so/dtc-service-mappings.json
index 76bfc274b..7c76cc2db 100644
--- a/salt/elasticsearch/templates/component/so/dtc-service-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-service-mappings.json
@@ -12,6 +12,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
@@ -21,6 +24,9 @@
               "ignore_above": 1024,
               "type": "keyword",
               "fields": {
+                "text": {
+                  "type": "match_only_text"
+                },
                 "keyword": {
                   "type": "keyword"
                 }
diff --git a/salt/elasticsearch/templates/component/so/dtc-user-mappings.json b/salt/elasticsearch/templates/component/so/dtc-user-mappings.json
index 3d0c3086a..92ef1e0df 100644
--- a/salt/elasticsearch/templates/component/so/dtc-user-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-user-mappings.json
@@ -14,8 +14,8 @@
                   "type": "match_only_text"
                 },
                 "keyword": {
-		  "type": "keyword"
-		}
+                  "type": "keyword"
+                }
               },
               "ignore_above": 1024,
               "type": "keyword"