diff --git a/addons/dine360_theme_chennora/views/checkout_address.xml b/addons/dine360_theme_chennora/views/checkout_address.xml
index 7b8d04e..ee6ea55 100644
--- a/addons/dine360_theme_chennora/views/checkout_address.xml
+++ b/addons/dine360_theme_chennora/views/checkout_address.xml
@@ -5,20 +5,16 @@
     <template id="chennora_address_custom" inherit_id="website_sale.address" name="Chennora Address Custom" priority="99">
         
         <!-- 1. Remove Company Name Field -->
-        <xpath expr="//label[@for='company_name']/.." position="replace"/>
+        <xpath expr="//div[label[@for='company_name']]" position="replace"/>
 
         <!-- 2. Remove VAT Field -->
-        <xpath expr="//label[@for='vat']/.." position="replace"/>
+        <xpath expr="//div[label[@for='vat']]" position="replace"/>
         
         <!-- 3. Remove VAT Warning Message if it exists -->
         <xpath expr="//small[contains(text(), 'VAT number is not allowed')]/.." position="replace"/>
 
-        <!-- 4. Rename Zip Code Label to Postal Code (First instance) -->
-        <xpath expr="//label[@for='zip']" position="replace">
-            <label class="col-form-label label-optional" for="zip">Postal Code</label>
-        </xpath>
-
-        <!-- 5. Rename Zip Code Label to Postal Code (Second instance if it exists) -->
+        <!-- 4. Rename Zip Code Label to Postal Code (Using more robust match) -->
+        <!-- 4. Rename Zip Code Label to Postal Code -->
         <xpath expr="//label[@for='zip']" position="replace">
             <label class="col-form-label label-optional" for="zip">Postal Code</label>
         </xpath>
@@ -39,7 +35,7 @@
         </xpath>
 
         <!-- 9. Remove the "Be aware!" warning box -->
-        <xpath expr="//div[contains(@class, 'alert-warning')][.//h4[contains(., 'Be aware')]]" position="replace"/>
+        <xpath expr="//div[contains(@class, 'alert-warning') and .//h4[contains(., 'Be aware')]]" position="replace"/>
     </template>
 
     <!-- Custom Checkout Page - Remove Shipping Section entirely -->