diff --git a/core/config.py b/core/config.py
index 65f7535..c497a3a 100644
--- a/core/config.py
+++ b/core/config.py
@@ -76,7 +76,7 @@ class Settings(BaseSettings):
         'median': lambda x: func.median(x),
         'max': lambda x: func.max(x),
         'min': lambda x: func.min(x),
-        'distinct_count': lambda x: func.count(func.distinct_count(x)),
+        'distinct_count': lambda x: func.count(func.distinct(x)),
     }
 
     CK_OPERATOR = {
diff --git a/models/behavior_analysis.py b/models/behavior_analysis.py
index bd7e3f2..1bab487 100644
--- a/models/behavior_analysis.py
+++ b/models/behavior_analysis.py
@@ -299,6 +299,7 @@ ORDER BY level
             event_name_col == event_name
 
         ]
+
         if analysis in ['times', 'number_of_days', 'number_of_hours']:
 
             qry = sa.select(event_date_col, func.count().label('values')) \
@@ -325,5 +326,6 @@ ORDER BY level
                 'sql': sql,
                 'interval_type': event['intervalType'],
                 'analysis': analysis,
-                'quota_interval_arr': quota_interval_arr
+                'quota_interval_arr': quota_interval_arr,
+                'groupby': [i.key for i in self.groupby]
             }