diff --git a/elastic/templates/browbeat-shaker-.json b/elastic/templates/browbeat-shaker-.json
index 8dd95a61b..f533e4149 100644
--- a/elastic/templates/browbeat-shaker-.json
+++ b/elastic/templates/browbeat-shaker-.json
@@ -42,6 +42,26 @@
                 run: {
                     type: "long"
                 },
+                record: {
+                    properties: {
+                        agent: {
+                            index: "not_analyzed",
+                            type: "string"
+                        },
+                        node: {
+                            index: "not_analyzed",
+                            type: "string"
+                        },
+                        scenario: {
+                            index: "not_analyzed",
+                            type: "string"
+                        },
+                        test: {
+                            index: "not_analyzed",
+                            type: "string"
+                        }
+                    }
+                },
                 shaker_test_info: {
                     properties: {
                         deployment: {
@@ -56,6 +76,10 @@
                             index: "not_analyzed",
                             type: "string"
                         },
+                        title: {
+                            index: "not_analyzed",
+                            type: "string"
+                        },
                         execution: {
                             properties: {
                                 progression: {