diff --git a/pkg/querier/consume.go b/pkg/querier/consume.go
index 40a44d62982a..698315bde54c 100644
--- a/pkg/querier/consume.go
+++ b/pkg/querier/consume.go
@@ -301,7 +301,7 @@ func readAsScalar(rows driver.Rows, queryName string) (*qbtypes.RawData, error)
 		}
 
 		rr := qbtypes.RawRow{
-			Data: make(map[string]*any, colCnt),
+			Data: make(map[string]any, colCnt),
 		}
 
 		for i, cellPtr := range scan {
diff --git a/pkg/telemetrytraces/trace_operator_cte_builder.go b/pkg/telemetrytraces/trace_operator_cte_builder.go
index 4cb78cac48da..627bcf320273 100644
--- a/pkg/telemetrytraces/trace_operator_cte_builder.go
+++ b/pkg/telemetrytraces/trace_operator_cte_builder.go
@@ -223,7 +223,7 @@ func (b *traceOperatorCTEBuilder) buildQueryCTE(queryName string) (string, error
 
 	// Get key selectors for the query
 	keySelectors := getKeySelectors(*query)
-	keys, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
+	keys, _, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
 	if err != nil {
 		return "", err
 	}
@@ -243,7 +243,7 @@ func (b *traceOperatorCTEBuilder) buildQueryCTE(queryName string) (string, error
 
 	// Add filter conditions if present
 	if query.Filter != nil && query.Filter.Expression != "" {
-		filterWhereClause, _, err := querybuilder.PrepareWhereClause(
+		filterWhereClause, err := querybuilder.PrepareWhereClause(
 			query.Filter.Expression,
 			querybuilder.FilterExprVisitorOpts{
 				FieldMapper:      b.stmtBuilder.fm,
@@ -255,7 +255,7 @@ func (b *traceOperatorCTEBuilder) buildQueryCTE(queryName string) (string, error
 			return "", err
 		}
 		if filterWhereClause != nil {
-			sb.AddWhereClause(filterWhereClause)
+			sb.AddWhereClause(filterWhereClause.WhereClause)
 		}
 	}
 
@@ -515,7 +515,7 @@ func (b *traceOperatorCTEBuilder) buildTimeSeriesQuery(selectFromCTE string) (*q
 
 	// Get keys for field mapping
 	keySelectors := b.getKeySelectors()
-	keys, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
+	keys, _, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
 	if err != nil {
 		return nil, err
 	}
@@ -600,7 +600,7 @@ func (b *traceOperatorCTEBuilder) buildScalarQuery(selectFromCTE string) (*qbtyp
 
 	// Get keys for field mapping
 	keySelectors := b.getKeySelectors()
-	keys, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
+	keys, _, err := b.stmtBuilder.metadataStore.GetKeysMulti(b.ctx, keySelectors)
 	if err != nil {
 		return nil, err
 	}