diff --git a/bi_sql_editor/__manifest__.py b/bi_sql_editor/__manifest__.py
index 3a909ba72..effbe4dab 100644
--- a/bi_sql_editor/__manifest__.py
+++ b/bi_sql_editor/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "BI SQL Editor",
     "summary": "BI Views builder, based on Materialized or Normal SQL Views",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "license": "AGPL-3",
     "category": "Reporting",
     "author": "GRAP,Odoo Community Association (OCA)",
@@ -20,4 +20,5 @@
     "demo": ["demo/res_groups_demo.xml", "demo/bi_sql_view_demo.xml"],
     "installable": True,
     "uninstall_hook": "uninstall_hook",
+    "maintainers": ["legalsylvain"],
 }
diff --git a/bi_sql_editor/demo/bi_sql_view_demo.xml b/bi_sql_editor/demo/bi_sql_view_demo.xml
index 6e7e97116..f5a2efe41 100644
--- a/bi_sql_editor/demo/bi_sql_view_demo.xml
+++ b/bi_sql_editor/demo/bi_sql_view_demo.xml
@@ -11,10 +11,10 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
         <field
             name="query"
         ><![CDATA[
-                    SELECT *
-                    FROM unexisting_table
-                    ORDER BY unexisting_field
-                    ]]>
+            SELECT *
+            FROM unexisting_table
+            ORDER BY unexisting_field
+            ]]>
             </field>
     </record>
     <record id="partner_sql_view" model="bi.sql.view">
@@ -23,13 +23,13 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
         <field
             name="query"
         ><![CDATA[
-                                    SELECT
-                                        name as x_name,
-                                        street as x_street,
-                                        company_id as x_company_id
-                                    FROM res_partner
-                                    ORDER BY name
-                                    ]]>
+            SELECT
+                name as x_name,
+                street as x_street,
+                company_id as x_company_id
+            FROM res_partner
+            ORDER BY name
+            ]]>
             </field>
     </record>
     <record id="module_sql_view" model="bi.sql.view">
@@ -39,14 +39,14 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
         <field
             name="query"
         ><![CDATA[
-                                SELECT
-                                    name as x_name,
-                                    case
-                                        when author ilike '%OpenERP SA%' THEN 'Odoo SA'
-                                        when author ilike '%Odoo Community Association (OCA)%' THEN 'OCA'
-                                       else 'Undefined Author' END as x_author_type
-                                FROM ir_module_module
-                                ]]>
+            SELECT
+                name as x_name,
+                case
+                    when author ilike '%OpenERP SA%' THEN 'Odoo SA'
+                    when author ilike '%Odoo Community Association (OCA)%' THEN 'OCA'
+                    else 'Undefined Author' END as x_author_type
+            FROM ir_module_module
+            ]]>
             </field>
     </record>
     <function
diff --git a/bi_sql_editor/models/bi_sql_view.py b/bi_sql_editor/models/bi_sql_view.py
index 5a5707410..af7b1213e 100644
--- a/bi_sql_editor/models/bi_sql_view.py
+++ b/bi_sql_editor/models/bi_sql_view.py
@@ -526,7 +526,7 @@ class BiSQLView(models.Model):
             return self.name
         return "{} ({})".format(
             self.name,
-            datetime.utcnow().strftime(_("%m/%d/%Y %H:%M:%S UTC")),
+            datetime.utcnow().strftime("%m/%d/%Y %H:%M:%S UTC"),
         )
 
     def _prepare_menu(self):
diff --git a/bi_sql_editor/models/ir_model.py b/bi_sql_editor/models/ir_model.py
index e3d7ed1f1..a3359ea90 100644
--- a/bi_sql_editor/models/ir_model.py
+++ b/bi_sql_editor/models/ir_model.py
@@ -5,5 +5,6 @@ class IrModelFields(models.Model):
     _inherit = "ir.model.fields"
 
     def _add_manual_fields(self, model):
-        super()._add_manual_fields(model)
+        res = super()._add_manual_fields(model)
         self.env["bi.sql.view"].check_manual_fields(model)
+        return res
diff --git a/bi_sql_editor/views/view_bi_sql_view.xml b/bi_sql_editor/views/view_bi_sql_view.xml
index f2b127ee7..5da5235f4 100644
--- a/bi_sql_editor/views/view_bi_sql_view.xml
+++ b/bi_sql_editor/views/view_bi_sql_view.xml
@@ -129,6 +129,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                                 nolabel="1"
                                 colspan="4"
                                 attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                widget="ace"
                             />
                         </page>
                         <page