diff --git a/panoramix/forms.py b/panoramix/forms.py
index 0a0b45d66cda6..efceca9e4cfd2 100644
--- a/panoramix/forms.py
+++ b/panoramix/forms.py
@@ -219,16 +219,16 @@ class QueryForm(OmgWtForm):
             json = HiddenField()
             previous_viz_type = HiddenField()
 
-
+        filter_cols = datasource.filterable_column_names or ['']
         for i in range(10):
             setattr(QueryForm, 'flt_col_' + str(i), SelectField(
                 'Filter 1',
-                default='',
-                choices=[(s, s) for s in datasource.filterable_column_names]))
+                default=filter_cols[0],
+                choices=self.choicify(filter_cols)))
             setattr(QueryForm, 'flt_op_' + str(i), SelectField(
                 'Filter 1',
-                default='',
-                choices=[(m, m) for m in ['in', 'not in']]))
+                default='in',
+                choices=self.choicify(['in', 'not in'])))
             setattr(
                 QueryForm, 'flt_eq_' + str(i),
                 TextField("Super", default=''))
diff --git a/panoramix/viz.py b/panoramix/viz.py
index 47c1f9aaff434..b2d2d351df2ff 100644
--- a/panoramix/viz.py
+++ b/panoramix/viz.py
@@ -41,12 +41,12 @@ def __init__(self, datasource, form_data):
             form = form_class(form_data)
         else:
             form = form_class(**form_data)
+
+        data = form.data.copy()
         if not form.validate():
             for k, v in form.errors.items():
-                if not k.startswith("flt") and not form_data.get('token'):
+                if not data.get('json') and not data.get('async'):
                     flash("{}: {}".format(k, " ".join(v)), 'danger')
-
-        data = form.data.copy()
         previous_viz_type = form_data.get('previous_viz_type')
         if previous_viz_type in viz_types and previous_viz_type != self.viz_type:
             data = {