diff --git a/base_comment_template/views/base_comment_template_view.xml b/base_comment_template/views/base_comment_template_view.xml
index 1dc6d1f6e..28e175048 100644
--- a/base_comment_template/views/base_comment_template_view.xml
+++ b/base_comment_template/views/base_comment_template_view.xml
@@ -4,7 +4,7 @@
         <field name="name">base.comment.template.search</field>
         <field name="model">base.comment.template</field>
         <field name="arch" type="xml">
-            <tree string="Comment Templates">
+            <tree name="Comment Templates">
                 <field name="sequence" widget="handle" />
                 <field name="name" />
                 <field name="position" />
diff --git a/base_comment_template/wizard/base_comment_template_preview_views.xml b/base_comment_template/wizard/base_comment_template_preview_views.xml
index 513bab63d..3d9c02df6 100644
--- a/base_comment_template/wizard/base_comment_template_preview_views.xml
+++ b/base_comment_template/wizard/base_comment_template_preview_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
         <!-- SMS Template Preview -->
         <record model="ir.ui.view" id="base_comment_template_preview_form">
             <field name="name">base.comment.template.preview.form</field>
@@ -9,33 +8,33 @@
                 <form string="Base Comment Preview">
                     <h3>Preview of
                         <field
-                            name="base_comment_template_id"
-                            readonly="1"
-                            nolabel="1"
-                            class="oe_inline"
-                        />
+                        name="base_comment_template_id"
+                        readonly="1"
+                        nolabel="1"
+                        class="oe_inline"
+                    />
                     </h3>
                     <field name="no_record" invisible="1" />
                     <field name="model_ids" />
                     <div class="o_row">
                         <span>Choose an example
                             <field
-                                name="model_id"
-                                domain="[('id', 'in', model_ids or False)]"
-                            />
+                            name="model_id"
+                            domain="[('id', 'in', model_ids or False)]"
+                        />
                             record:
                         </span>
                         <div>
                             <field
-                                name="resource_ref"
-                                class="oe_inline"
-                                options="{'hide_model': True, 'no_create': True, 'no_edit': True, 'no_open': True}"
-                                attrs="{'invisible': [('no_record', '=', True)]}"
-                            />
+                            name="resource_ref"
+                            class="oe_inline"
+                            options="{'hide_model': True, 'no_create': True, 'no_edit': True, 'no_open': True}"
+                            attrs="{'invisible': [('no_record', '=', True)]}"
+                        />
                             <span
-                                class="text-warning"
-                                attrs="{'invisible': [('no_record', '=', False)]}"
-                            >No records
+                            class="text-warning"
+                            attrs="{'invisible': [('no_record', '=', False)]}"
+                        >No records
                             </span>
                         </div>
                     </div>
@@ -48,18 +47,18 @@
                     <label for="body" string="Base Comment content" />
                     <hr />
                     <field
-                        name="body"
-                        readonly="1"
-                        nolabel="1"
-                        options='{"safe": True}'
-                    />
+                    name="body"
+                    readonly="1"
+                    nolabel="1"
+                    options='{"safe": True}'
+                />
                     <hr />
                     <footer>
                         <button
-                            string="Discard"
-                            class="btn-secondary"
-                            special="cancel"
-                        />
+                        string="Discard"
+                        class="btn-secondary"
+                        special="cancel"
+                    />
                     </footer>
                 </form>
             </field>
@@ -76,5 +75,4 @@
         </record>
 
 
-    </data>
 </odoo>
diff --git a/bi_sql_editor/models/bi_sql_view.py b/bi_sql_editor/models/bi_sql_view.py
index b9b5d8420..1c58c2520 100644
--- a/bi_sql_editor/models/bi_sql_view.py
+++ b/bi_sql_editor/models/bi_sql_view.py
@@ -450,7 +450,7 @@ class BiSQLView(models.Model):
             "type": "tree",
             "model": self.model_id.model,
             "arch": """<?xml version="1.0"?>"""
-            """<tree string="Analysis">{}"""
+            """<tree name="Analysis">{}"""
             """</tree>""".format(
                 "".join([x._prepare_tree_field() for x in self.bi_sql_view_field_ids])
             ),
diff --git a/report_async/data/mail_template.xml b/report_async/data/mail_template.xml
index 01ea4b9d5..ac2f43e19 100644
--- a/report_async/data/mail_template.xml
+++ b/report_async/data/mail_template.xml
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
         <record id="async_report_delivery" model="mail.template">
             <field name="name">Report Async: New Report Available</field>
             <field name="model_id" ref="base.model_ir_attachment" />
             <field name="subject">Your report is available, ${object.name}</field>
             <field
-                name="email_from"
-            >${object.company_id.partner_id.email_formatted|safe}</field>
+            name="email_from"
+        >${object.company_id.partner_id.email_formatted|safe}</field>
             <field name="partner_to">${user.partner_id.id}</field>
             <field name="body_html" type="html">
                 <table
-                    border="0"
-                    cellpadding="0"
-                    cellspacing="0"
-                    style="background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"
-                >
+                border="0"
+                cellpadding="0"
+                cellspacing="0"
+                style="background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"
+            >
                     <tr>
                         <td align="center">
                             <table
-                                border="0"
-                                cellpadding="0"
-                                cellspacing="0"
-                                width="590"
-                                style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;"
-                            >
+                            border="0"
+                            cellpadding="0"
+                            cellspacing="0"
+                            width="590"
+                            style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;"
+                        >
                                 <tbody>
                                     <tr>
                                         <td align="center" style="min-width: 590px;">
                                             <table
-                                                border="0"
-                                                cellpadding="0"
-                                                cellspacing="0"
-                                                width="590"
-                                                style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"
-                                            >
+                                            border="0"
+                                            cellpadding="0"
+                                            cellspacing="0"
+                                            width="590"
+                                            style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;"
+                                        >
                                                 <tr>
                                                     <td
-                                                        valign="top"
-                                                        style="font-size: 13px;"
-                                                    >
+                                                    valign="top"
+                                                    style="font-size: 13px;"
+                                                >
                                         % set base_url_async = object.env['ir.config_parameter'].sudo().get_param('web.base.url.async_reports')
                                         % set base_url = base_url_async or object.env['ir.config_parameter'].sudo().get_param('web.base.url')
                                         % set download_url = '%s/web/content/ir.attachment/%s/datas/%s?download=true' % (base_url, object.id, object.name, )
@@ -47,10 +46,10 @@
                                             Dear ${object.create_uid.partner_id.name or ''},
                                             <br /><br />
                                             Your requested report, ${object.name}, is available for <b
-                                                            >
+                                                        >
                                                                 <a
-                                                                    href='${download_url}'
-                                                                >download</a>
+                                                                href='${download_url}'
+                                                            >download</a>
                                                             </b>.
                                             <br /><br />
                                             Have a nice day!<br />
@@ -69,5 +68,4 @@
             </field>
             <field name="auto_delete" eval="True" />
         </record>
-    </data>
 </odoo>
diff --git a/report_async/views/report_async.xml b/report_async/views/report_async.xml
index 406856543..c3bc8f3cc 100644
--- a/report_async/views/report_async.xml
+++ b/report_async/views/report_async.xml
@@ -4,7 +4,7 @@
         <field name="name">report.async.tree</field>
         <field name="model">report.async</field>
         <field name="arch" type="xml">
-            <tree string="Report Center">
+            <tree name="Report Center">
                 <field name="action_id" context="{'access_sudo': True}" />
                 <button type="object" name="run_now" string="Run Now" icon="fa-bolt" />
                 <button
diff --git a/report_context/data/config_parameter.xml b/report_context/data/config_parameter.xml
index b8439bc64..05aab14f7 100644
--- a/report_context/data/config_parameter.xml
+++ b/report_context/data/config_parameter.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
         <record
-            id="report_default_context"
-            model="ir.config_parameter"
-            forcecreate="True"
-        >
+        id="report_default_context"
+        model="ir.config_parameter"
+        forcecreate="True"
+    >
             <field name="key">report.default.context</field>
             <field name="value">{}</field>
         </record>
-    </data>
 </odoo>
diff --git a/report_label/data/paperformat_label.xml b/report_label/data/paperformat_label.xml
index 7da0a7058..c391fec9d 100644
--- a/report_label/data/paperformat_label.xml
+++ b/report_label/data/paperformat_label.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
+<odoo noupdate="1">
 
         <record id="agipa_114016" model="report.paperformat.label">
             <field name="name">Label: Agipa 114016</field>
@@ -22,6 +21,4 @@
             <field name="label_margin_bottom" eval="1" />
             <field name="label_margin_left" eval="1" />
         </record>
-
-    </data>
 </odoo>
diff --git a/report_label/views/report_paperformat_label.xml b/report_label/views/report_paperformat_label.xml
index e31d4391c..b962b66f3 100644
--- a/report_label/views/report_paperformat_label.xml
+++ b/report_label/views/report_paperformat_label.xml
@@ -43,7 +43,7 @@
     <record id="paperformat_label_view_tree" model="ir.ui.view">
         <field name="model">report.paperformat.label</field>
         <field name="arch" type="xml">
-            <tree string="Label paper format configuration">
+            <tree name="Label paper format configuration">
                 <field name="name" />
                 <field name="label_height" />
                 <field name="label_width" />
diff --git a/report_layout_config/templates/report_templates.xml b/report_layout_config/templates/report_templates.xml
index d10909717..24d7b1f27 100644
--- a/report_layout_config/templates/report_templates.xml
+++ b/report_layout_config/templates/report_templates.xml
@@ -4,6 +4,7 @@
         id="external_standard_layout_images_template"
         primary="True"
         inherit_id="web.external_layout_standard"
+        priority="99"
     >
         <xpath expr="//div[contains(@t-attf-class, 'header')]" position="replace">
             <div class="header">
@@ -45,6 +46,7 @@
         id="external_clean_layout_images_template"
         primary="True"
         inherit_id="web.external_layout_clean"
+        priority="99"
     >
         <xpath expr="//div[contains(@t-attf-class, 'header')]" position="replace">
             <div class="header">
diff --git a/report_py3o/views/py3o_template.xml b/report_py3o/views/py3o_template.xml
index f6f7be80a..bc22fa251 100644
--- a/report_py3o/views/py3o_template.xml
+++ b/report_py3o/views/py3o_template.xml
@@ -34,7 +34,7 @@
         <field name="name">py3o.template.configuration.tree.view</field>
         <field name="model">py3o.template</field>
         <field name="arch" type="xml">
-            <tree string="Py3o Templates">
+            <tree name="Py3o Templates">
                 <field name="name" />
                 <field name="filetype" />
             </tree>
diff --git a/report_py3o_fusion_server/views/py3o_pdf_options.xml b/report_py3o_fusion_server/views/py3o_pdf_options.xml
index 4a574838b..bb4a13179 100644
--- a/report_py3o_fusion_server/views/py3o_pdf_options.xml
+++ b/report_py3o_fusion_server/views/py3o_pdf_options.xml
@@ -182,7 +182,7 @@
         <field name="name">py3o.pdf.options.tree</field>
         <field name="model">py3o.pdf.options</field>
         <field name="arch" type="xml">
-            <tree string="Py3o PDF Export Options">
+            <tree name="Py3o PDF Export Options">
                 <field name="name" />
             </tree>
         </field>
diff --git a/report_py3o_fusion_server/views/py3o_server.xml b/report_py3o_fusion_server/views/py3o_server.xml
index 879cc0247..5033234d9 100644
--- a/report_py3o_fusion_server/views/py3o_server.xml
+++ b/report_py3o_fusion_server/views/py3o_server.xml
@@ -17,7 +17,7 @@
         <field name="name">py3o.server.configuration.tree.view</field>
         <field name="model">py3o.server</field>
         <field name="arch" type="xml">
-            <tree string="Py3o Servers Configuration">
+            <tree name="Py3o Servers Configuration">
                 <field name="url" />
                 <field name="pdf_options_id" />
                 <field name="is_active" />
diff --git a/report_qweb_element_page_visibility/views/layouts.xml b/report_qweb_element_page_visibility/views/layouts.xml
index b5d19b4d4..a96a56047 100644
--- a/report_qweb_element_page_visibility/views/layouts.xml
+++ b/report_qweb_element_page_visibility/views/layouts.xml
@@ -1,5 +1,5 @@
 <odoo>
-    <template id="minimal_layout" inherit_id="web.minimal_layout">
+    <template id="minimal_layout" inherit_id="web.minimal_layout" priority="99">
         <xpath expr="//t[@t-if='subst_needed']" position="replace">
             <t t-if="subst is True">
                 <script>
diff --git a/report_qweb_pdf_watermark/demo/report.xml b/report_qweb_pdf_watermark/demo/report.xml
index 8c752c53a..a030ed97c 100644
--- a/report_qweb_pdf_watermark/demo/report.xml
+++ b/report_qweb_pdf_watermark/demo/report.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data>
         <record id="demo_reports" model="ir.actions.report">
             <field name="name">Demo report</field>
             <field name="model">res.users</field>
@@ -30,5 +29,4 @@
                 </t>
             </t>
         </template>
-    </data>
 </odoo>
diff --git a/report_qweb_signer/views/report_certificate_view.xml b/report_qweb_signer/views/report_certificate_view.xml
index bae899f22..923c036e9 100644
--- a/report_qweb_signer/views/report_certificate_view.xml
+++ b/report_qweb_signer/views/report_certificate_view.xml
@@ -60,7 +60,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="name">report.certificate.tree</field>
         <field name="model">report.certificate</field>
         <field name="arch" type="xml">
-            <tree string="PDF report certificates">
+            <tree name="PDF report certificates">
                 <field name="sequence" widget="handle" />
                 <field name="name" />
                 <field name="path" />