diff --git a/fusion_repairs/data/mail_template_data.xml b/fusion_repairs/data/mail_template_data.xml
index b6bbe0d1..fb12c0e4 100644
--- a/fusion_repairs/data/mail_template_data.xml
+++ b/fusion_repairs/data/mail_template_data.xml
@@ -125,8 +125,8 @@
             We would love to hear how it went - your feedback helps other clients
             find us and helps us improve.
         </p>
-        <!-- H4: URL-encode the company name so the fallback URL survives ampersands + spaces. -->
-        <t t-set="review_url" t-value="object.company_id.x_fc_google_review_url or ('https://www.google.com/search?' + url_encode({'q': object.company_id.name or ''}))"/>
+        <!-- H4: build a fallback search URL without url_encode (not available in the mail QWeb render context); replace spaces so the URL survives. -->
+        <t t-set="review_url" t-value="object.company_id.x_fc_google_review_url or ('https://www.google.com/search?q=' + (object.company_id.name or '').replace(' ', '+'))"/>
         <div style="text-align:center;margin:0 0 24px 0;">
             <a t-att-href="review_url"
                style="display:inline-block;padding:14px 28px;background-color:#38a169;color:#ffffff;text-decoration:none;border-radius:6px;font-size:16px;font-weight:600;">
diff --git a/fusion_repairs/views/menus.xml b/fusion_repairs/views/menus.xml
index 61e33661..775ba4a3 100644
--- a/fusion_repairs/views/menus.xml
+++ b/fusion_repairs/views/menus.xml
@@ -57,6 +57,13 @@
               action="action_repair_part_order"
               sequence="38"/>
 
+    <!-- Configuration parent: must be defined before the children that reference it below -->
+    <menuitem id="menu_fusion_repairs_configuration"
+              name="Configuration"
+              parent="menu_fusion_repairs_root"
+              sequence="90"
+              groups="fusion_repairs.group_fusion_repairs_manager"/>
+
     <menuitem id="menu_fusion_repairs_emergency_charges"
               name="Emergency Surcharges"
               parent="menu_fusion_repairs_configuration"
@@ -100,13 +107,6 @@
               action="action_repair_labor_warranty"
               sequence="36"/>
 
-    <!-- Configuration -->
-    <menuitem id="menu_fusion_repairs_configuration"
-              name="Configuration"
-              parent="menu_fusion_repairs_root"
-              sequence="90"
-              groups="fusion_repairs.group_fusion_repairs_manager"/>
-
     <menuitem id="menu_fusion_repairs_categories"
               name="Equipment Categories"
               parent="menu_fusion_repairs_configuration"