diff --git a/bi_sql_editor/models/bi_sql_view_field.py b/bi_sql_editor/models/bi_sql_view_field.py
index 291c1e11..18367842 100644
--- a/bi_sql_editor/models/bi_sql_view_field.py
+++ b/bi_sql_editor/models/bi_sql_view_field.py
@@ -45,7 +45,7 @@ class BiSQLViewField(models.Model):
         'numeric': 'float',
         'text': 'char',
         'character varying': 'char',
-        'date': 'datetime',
+        'date': 'date',
         'timestamp without time zone': 'datetime',
     }
 
@@ -227,7 +227,10 @@ class BiSQLViewField(models.Model):
         self.ensure_one()
         res = ''
         if self.field_description and self.is_group_by:
-            res =\
-                """<filter string="%s" context="{'group_by':'%s'}"/>""" % (
-                    self.field_description, self.name)
+            res = \
+                """<filter name="%s" string="%s"
+                        context="{'group_by':'%s'}"/>""" % (
+                    self.field_description.lower().replace(' ', '_'),
+                    self.field_description, self.name
+                )
         return res