diff --git a/app/models.py b/app/models.py
index feddeda2c57e7..37c1c4a6e416e 100644
--- a/app/models.py
+++ b/app/models.py
@@ -243,7 +243,7 @@ def query(
             subq = subq.limit(timeseries_limit)
             on_clause = []
             for gb in groupby:
-                on_clause.append(literal_column(s)==literal_column("__" + s))
+                on_clause.append(literal_column(gb)==literal_column("__" + gb))
 
             from_clause = from_clause.join(subq.alias(), and_(*on_clause))
 
diff --git a/app/templates/panoramix/viz_highcharts.html b/app/templates/panoramix/viz_highcharts.html
index dfad7fed67629..9c278c039bbab 100644
--- a/app/templates/panoramix/viz_highcharts.html
+++ b/app/templates/panoramix/viz_highcharts.html
@@ -21,15 +21,15 @@
   {% if form.entity %}
     <div>{{ form.entity.label }}: {{ form.entity(class_="form-control select2") }}</div>
   {% endif %}
+  {% if form.size %}
+    <div>{{ form.size.label }}: {{ form.size(class_="form-control select2") }}</div>
+  {% endif %}
   {% if form.x %}
     <div>{{ form.x.label }}: {{ form.x(class_="form-control select2") }}</div>
   {% endif %}
   {% if form.y %}
     <div>{{ form.y.label }}: {{ form.y(class_="form-control select2") }}</div>
   {% endif %}
-  {% if form.size %}
-    <div>{{ form.size.label }}: {{ form.size(class_="form-control select2") }}</div>
-  {% endif %}
 {% endblock %}
 
 {% block tail %}