diff --git a/app_mrp_production_chart/views/mrp_production_views.xml b/app_mrp_production_chart/views/mrp_production_views.xml
index 01faebbc..fd980c64 100644
--- a/app_mrp_production_chart/views/mrp_production_views.xml
+++ b/app_mrp_production_chart/views/mrp_production_views.xml
@@ -9,7 +9,7 @@
                 <field name="parent_id" groups="base.group_no_one" readonly="0"/>
             </xpath>
 
-            <xpath expr="//div[@class='oe_button_box']" position="after">
+            <xpath expr="//div[hasclass('oe_button_box')]" position="after">
                 <div id="o_node_container">
                     <div id="o_node_main">
                         <field name="image_128" widget="image" class="oe_avatar"
@@ -30,7 +30,7 @@
                 </div>
             </xpath>
             <xpath expr="//span[@id='add_title']" position="after">
-                <xpath expr="//div[@class='oe_title']" position="move"/>
+                <xpath expr="//div[hasclass('oe_title')]" position="move"/>
             </xpath>
             <xpath expr="//span[@id='add_group']" position="after">
                 <xpath expr="//group[1]" position="move"/>
diff --git a/app_mrp_production_chart/views/product_category_views.xml b/app_mrp_production_chart/views/product_category_views.xml
index c6f5c5a2..0f4ac313 100644
--- a/app_mrp_production_chart/views/product_category_views.xml
+++ b/app_mrp_production_chart/views/product_category_views.xml
@@ -5,7 +5,7 @@
         <field name="model">product.category</field>
         <field name="inherit_id" ref="product.product_category_form_view"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@class='oe_button_box']" position="after">
+            <xpath expr="//div[hasclass('oe_button_box')]" position="after">
                 <div id="o_node_container">
                     <div id="o_node_main">
                         <field name="image_1920" widget="image" class="oe_avatar"
@@ -26,7 +26,7 @@
                 </div>
             </xpath>
             <xpath expr="//span[@id='add_title']" position="after">
-                <xpath expr="//div[@class='oe_title']" position="move"/>
+                <xpath expr="//div[hasclass('oe_title')]" position="move"/>
             </xpath>
             <xpath expr="//span[@id='add_group']" position="after">
                 <xpath expr="//group[@name='first']" position="move"/>
diff --git a/app_users_chart_hierarchy/views/res_users_views.xml b/app_users_chart_hierarchy/views/res_users_views.xml
index 19e447f4..c29d3935 100644
--- a/app_users_chart_hierarchy/views/res_users_views.xml
+++ b/app_users_chart_hierarchy/views/res_users_views.xml
@@ -33,7 +33,7 @@
                 <xpath expr="//field[@name='image_1920']" position="move"/>
             </xpath>
             <xpath expr="//span[@id='add_title']" position="after">
-                <xpath expr="//div[@class='oe_title']" position="move"/>
+                <xpath expr="//div[hasclass('oe_title')]" position="move"/>
             </xpath>
             <xpath expr="//span[@id='add_group']" position="after">
                 <xpath expr="//group" position="move"/>