diff --git a/fusion_claims/static/src/js/service_booking/service_booking.js b/fusion_claims/static/src/js/service_booking/service_booking.js
index f5a4b861..674db193 100644
--- a/fusion_claims/static/src/js/service_booking/service_booking.js
+++ b/fusion_claims/static/src/js/service_booking/service_booking.js
@@ -25,8 +25,10 @@ export class ServiceBookingWizard extends Component {
         onWillStart(async () => {
             const r = await rpc("/fusion_claims/service_booking/refdata", {});
             Object.assign(this.state, {
-                technicians: r.technicians, calloutRates: r.callout_rates,
-                perKm: r.per_km, labour: r.labour,
+                technicians: r.technicians || [],
+                calloutRates: r.callout_rates || [],
+                perKm: r.per_km ?? 0.70,
+                labour: r.labour || this.state.labour,
             });
         });
     }
@@ -59,9 +61,13 @@ export class ServiceBookingWizard extends Component {
         this.state.device = ev.target.value;
         this.state.category = ev.target.value === "lift" ? "lift" : "standard";
     }
+    onCallType(ev) {
+        const r = this.state.calloutRates.find(x => x.code === ev.target.value);
+        if (r) { this.state.category = r.category; this.state.timing = r.timing; }
+    }
     setCust(m) { this.state.custMode = m; }
-    setTiming(t) { this.state.timing = t; }
     setAmpm(v) { this.state.ampm = v; }
+
     toggleInShop() { this.state.inShop = !this.state.inShop; }
     _timeStartFloat() { return (this.state.hour % 12) + (this.state.ampm === "PM" ? 12 : 0) + this.state.minute / 60; }
 
diff --git a/fusion_claims/static/src/scss/service_booking.scss b/fusion_claims/static/src/scss/service_booking.scss
index 74b3e00f..65fc2e50 100644
--- a/fusion_claims/static/src/scss/service_booking.scss
+++ b/fusion_claims/static/src/scss/service_booking.scss
@@ -221,7 +221,7 @@
         align-items: center;
         justify-content: space-between;
         background: var(--sb-money-soft);
-        border: 1px solid color-mix(in srgb, var(--sb-money) 35%, transparent);
+        border: 1px solid var(--sb-border);
         border-radius: 10px;
         padding: 11px 14px;
         margin-top: 4px;
@@ -234,7 +234,7 @@
     .estimate {
         grid-column: 1 / -1;
         background: var(--sb-money-soft);
-        border: 1px solid color-mix(in srgb, var(--sb-money) 40%, transparent);
+        border: 1px solid var(--sb-border);
         border-left: 5px solid var(--sb-money);
         border-radius: 13px;
         padding: 15px 18px;
diff --git a/fusion_claims/static/src/xml/service_booking.xml b/fusion_claims/static/src/xml/service_booking.xml
index 35377cdd..cb159716 100644
--- a/fusion_claims/static/src/xml/service_booking.xml
+++ b/fusion_claims/static/src/xml/service_booking.xml
@@ -82,7 +82,7 @@
                                 <div class="row" t-if="!state.inShop">
                                     <label class="fl">Service call type</label>
                                     <select class="f"
-                                            t-on-change="(ev) => { const r = state.calloutRates.find(x => x.code === ev.target.value); if (r) { state.category = r.category; state.timing = r.timing; } }">
+                                            t-on-change="onCallType">
                                         <t t-foreach="state.calloutRates" t-as="r" t-key="r.code">
                                             <option t-att-value="r.code"
                                                     t-att-selected="state.category === r.category and state.timing === r.timing">
@@ -143,7 +143,7 @@
                                 <div class="row">
                                     <label class="fl">Technician</label>
                                     <select class="f" t-model.number="state.technicianId">
-                                        <option value="false">— Choose —</option>
+                                        <option value="">— Choose —</option>
                                         <t t-foreach="state.technicians" t-as="t" t-key="t.id">
                                             <option t-att-value="t.id"><t t-esc="t.name"/></option>
                                         </t>