diff --git a/api/app/utilities/snowplow.py b/api/app/utilities/snowplow.py
index 9116d5bbe..035b3d2b1 100644
--- a/api/app/utilities/snowplow.py
+++ b/api/app/utilities/snowplow.py
@@ -211,8 +211,6 @@ def get_csr(csr, office, csr_id = 1000001, counter_name = "Counter", role_name="
                                     "role": role_name,
                                     "counter_type": counter_name
                                    })
-        print('returning snowplow data:')
-        pprint(vars(agent))
         return agent
 
     @staticmethod
diff --git a/appointment-frontend/src/components/appointment/LocationsList.vue b/appointment-frontend/src/components/appointment/LocationsList.vue
index 0a217c710..e9fa01898 100644
--- a/appointment-frontend/src/components/appointment/LocationsList.vue
+++ b/appointment-frontend/src/components/appointment/LocationsList.vue
@@ -16,6 +16,7 @@
             @change="officeSelection"
             @input="clickSelection"
             @keyup="setKeyPressed"
+            auto-select-first="true"
             hide-details
           >
           </v-combobox>
diff --git a/appointment-frontend/src/components/appointment/ServiceSelection.vue b/appointment-frontend/src/components/appointment/ServiceSelection.vue
index cab459896..258ec87c4 100644
--- a/appointment-frontend/src/components/appointment/ServiceSelection.vue
+++ b/appointment-frontend/src/components/appointment/ServiceSelection.vue
@@ -16,6 +16,7 @@
             @change="serviceSelection"
             @input="clickSelection"
             @keyup="setKeyPressed"
+            auto-select-first="true"
             hide-details
           >
             <template v-slot:selection="data">
diff --git a/frontend/src/components/Booking/booking-modal.vue b/frontend/src/components/Booking/booking-modal.vue
index 60a7c3e41..9b09cd5ef 100644
--- a/frontend/src/components/Booking/booking-modal.vue
+++ b/frontend/src/components/Booking/booking-modal.vue
@@ -87,7 +87,7 @@
                   <div class="ai-modal-title">
                     Selected:
                     <strong class="mr-2">{{
-                      invigilatorDetails.invigilator_name
+                      invigilatorDetails.name
                     }}</strong>
                   </div>
                   <div class="info-display-grid-container mt-1">
@@ -246,12 +246,14 @@ export default class BookingModal extends Vue {
   public booking_contact_information: any = ''
   public invigilator: any = null
   public formStep: any = 1
-  public fields: any = {
-    invigilator_name: {
-      label: 'Name',
-      thClass: 'd-none'
-    }
-  }
+  public fields: Array<any> = [
+    {key: 'value'},
+    {key: 'name'},
+    {key: 'shadow_count'},
+    {key: 'contact_phone', thClass: 'd-none', tdClass: 'd-none' },
+    {key: 'contact_email', thClass: 'd-none', tdClass: 'd-none' },
+    {key: 'invigilator_notes', thClass: 'd-none', tdClass: 'd-none' },
+  ]
 
   public savedRef: any = 'contact_information'
   public selectedOption: any = null
diff --git a/frontend/src/store/getters/getters-model.ts b/frontend/src/store/getters/getters-model.ts
index 1ed223dea..81bfad6af 100644
--- a/frontend/src/store/getters/getters-model.ts
+++ b/frontend/src/store/getters/getters-model.ts
@@ -100,7 +100,10 @@ export const commonGetters: any = {
       invigilators.push({
         value: i.invigilator_id,
         name: i.invigilator_name,
-        shadow_count: i.shadow_count
+        shadow_count: i.shadow_count,
+        contact_phone: i.contact_phone || '',
+        contact_email: i.contact_email || '',
+        invigilator_notes: i.invigilator_notes || ''
       })
     })
     return invigilators.filter(i => i.shadow_count == 2)