diff --git a/packages/lezer-metricsql/src/metricsql.grammar b/packages/lezer-metricsql/src/metricsql.grammar
index 64158831..fd84aac7 100644
--- a/packages/lezer-metricsql/src/metricsql.grammar
+++ b/packages/lezer-metricsql/src/metricsql.grammar
@@ -43,7 +43,18 @@ AggregateOp {
   Stddev |
   Stdvar |
   Sum |
-  Topk
+  Topk |
+  Median |
+  Distinct |
+  Geomean |
+  Histogram |
+  Any |
+  Mad |
+  Mode |
+  Share |
+  Sum2 |
+  Zscore |
+  Limitk
 }
 
 AggregateModifier {
@@ -237,9 +248,6 @@ FunctionIdentifier {
   RunningMax |
   RunningMin |
   RunningSum |
-  Distinct |
-  Geomean |
-  Histogram |
   BottomkAvg |
   BottomkLast |
   BottomkMax |
@@ -250,14 +258,6 @@ FunctionIdentifier {
   TopkMax |
   TopkMedian |
   TopkMin |
-  Any |
-  Limitk |
-  Mad |
-  Median |
-  Mode |
-  Share |
-  Sum2 |
-  Zscore |
   LabelDel |
   LabelKeep |
   LabelLowercase |
diff --git a/src/querybuilder/aggregations.ts b/src/querybuilder/aggregations.ts
index fef630fa..04b29ebe 100755
--- a/src/querybuilder/aggregations.ts
+++ b/src/querybuilder/aggregations.ts
@@ -15,6 +15,9 @@ export function getAggregationOperations(): QueryBuilderOperationDef[] {
     ...createAggregationOperation(PromOperationId.Min),
     ...createAggregationOperation(PromOperationId.Max),
     ...createAggregationOperation(PromOperationId.Count),
+    ...createAggregationOperation(PromOperationId.Distinct),
+    ...createAggregationOperation(PromOperationId.Geomean),
+    ...createAggregationOperation(PromOperationId.Histogram),
     ...createAggregationOperationWithParam(PromOperationId.TopK, {
       params: [{ name: 'K-value', type: 'number' }],
       defaultParams: [5],
diff --git a/src/querybuilder/metricsql-functions/basic/index.ts b/src/querybuilder/metricsql-functions/basic/index.ts
index 2065e810..67f26939 100644
--- a/src/querybuilder/metricsql-functions/basic/index.ts
+++ b/src/querybuilder/metricsql-functions/basic/index.ts
@@ -24,9 +24,6 @@ const basicFunctions = [
   PromOperationId.RunningMax,
   PromOperationId.RunningMin,
   PromOperationId.RunningSum,
-  PromOperationId.Distinct,
-  PromOperationId.Geomean,
-  PromOperationId.Histogram
 ]
 
 export function getBasicFunctions(): QueryBuilderOperationDef[] {