diff --git a/api_logs/api-logs.go b/api_logs/api-logs.go
index e0e446d90bf3863722a2fecef111f9db1c7915c1..3ea8a07f6b9fedfd45551bfacfde0e66a7da744b 100644
--- a/api_logs/api-logs.go
+++ b/api_logs/api-logs.go
@@ -194,14 +194,14 @@ type ApiLog struct {
 }
 
 type ApiLogRequest struct {
-	Headers         map[string]string `json:"headers,omitempty"` // NOTE: Once we're on OpenSearch 2.7, we should add search:"flattened" here
-	QueryParameters map[string]string `json:"query_parameters,omitempty"`
+	Headers         map[string]string `json:"headers,omitempty" search:"flattened"`
+	QueryParameters map[string]string `json:"query_parameters,omitempty" search:"flattened"`
 	BodySize        int               `json:"body_size" search:"long"` // set even when body is truncated/omitted
 	Body            string            `json:"body,omitempty"`          // json body as a string
 }
 
 type ApiLogResponse struct {
-	Headers  map[string]string `json:"headers,omitempty"` // NOTE: Once we're on OpenSearch 2.7, we should add search:"flattened" here
-	BodySize int               `json:"body_size"`         // set even when body is truncated/omitted
-	Body     string            `json:"body,omitempty"`    // json content as a string
+	Headers  map[string]string `json:"headers,omitempty" search:"flattened"`
+	BodySize int               `json:"body_size"`      // set even when body is truncated/omitted
+	Body     string            `json:"body,omitempty"` // json content as a string
 }