diff --git a/app/components/ComboSelect.vue b/app/components/ComboSelect.vue
index c002e033..867a9579 100644
--- a/app/components/ComboSelect.vue
+++ b/app/components/ComboSelect.vue
@@ -86,19 +86,14 @@ import {
 } from '@headlessui/vue'
 import { CheckIcon, ChevronUpDownIcon } from '@heroicons/vue/20/solid'
 
-const { options, multiple } = withDefaults(
-  defineProps<{
+const { options, multiple, optionsDisplay = (option: any) => option} = defineProps<{
     modelValue: any
     options: ComputedRef<Array<any>>
     /** Whether multiple options can be selected */
     multiple?: boolean
     /** Function called for getting the display string for a given option */
     optionsDisplay?: (option: any) => string
-  }>(),
-  {
-    optionsDisplay: (option: any) => option,
-  }
-)
+  }>()
 
 const query = ref('')
 const filteredOptions = computed(() =>
diff --git a/app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue b/app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue
index d4708f38..847f9402 100644
--- a/app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue
+++ b/app/components/examine/request_info/dates_and_expiry/ExpiryAndConsentEditable.vue
@@ -88,10 +88,16 @@ function setDefaultInputValues() {
 examine.addEditAction({
   validate() {
     let isValid = true
-    if (examine.expiryDate && !expiry.value) {
-      expiryDateErrorText.value = 'Expiry date is required'
-      isValid = false
+    if (examine.expiryDate) {
+      if (expiry.value) {
+        isValid = DateTime.fromISO(expiry.value).startOf('day') >= DateTime.now().startOf('day')
+        expiryDateErrorText.value = isValid ? '' : 'Expiry date must be today or later';
+      } else {
+        expiryDateErrorText.value = 'Expiry date is required'
+        isValid = false
+      }
     }
+
     if (consentFlag.value === ConsentFlag.Received && !consentDate.value) {
       consentDateErrorText.value = 'Consent date is required'
       isValid = false
diff --git a/app/components/search/ResultsBox.vue b/app/components/search/ResultsBox.vue
index 662c0145..b53e6420 100644
--- a/app/components/search/ResultsBox.vue
+++ b/app/components/search/ResultsBox.vue
@@ -98,14 +98,13 @@
           </td>
         </tr>
       </tbody>
-
-      <div
-        class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform"
-      >
-        <LoadingSpinner v-if="search.isLoading" />
-      </div>
     </table>
 
+    <div v-if="search.isLoading"
+         class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
+      <LoadingSpinner />
+    </div>
+
     <PopupDialog :show="showDateDialog">
       <template #title>Choose a Date Range</template>
       <SearchDateForm
diff --git a/app/package.json b/app/package.json
index acb0052b..232494b9 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-examination",
-  "version": "1.2.45",
+  "version": "1.2.46",
   "private": true,
   "scripts": {
     "build": "nuxt generate",
diff --git a/app/pages/Stats.vue b/app/pages/Stats.vue
index 775907e6..f16cf965 100644
--- a/app/pages/Stats.vue
+++ b/app/pages/Stats.vue
@@ -98,10 +98,12 @@
             <td>{{ item.furnished }}</td>
           </tr>
         </tbody>
-        <div class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
-          <LoadingSpinner v-if="isLoading" />
-        </div>
       </table>
+      <div v-if="isLoading"
+           class="absolute bottom-1/2 right-1/2 translate-x-1/2 translate-y-1/2 transform">
+        <LoadingSpinner />
+      </div>
+
     </div>
   </div>
 </template>