diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 1148c2842..7e53d60ff 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -361,7 +361,7 @@ export default {
     isWindshieldRepair() {
       if (!this.isWindshieldDamageLocation) return false;
 
-      return this.selectedWindshieldOptions.selectedWindshieldDamageType.toUpperCase() === damageLocationsSelected.REPAIR;
+      return this.selectedWindshieldOptions.selectedWindshieldDamageType.toUpperCase() === damageLocationsSelected.REPAIR.toUpperCase();
     },
     isDriverSideReplace() {
       if (!this.isSideDoorDamageLocation) return false;
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 64dd831b9..21ee0686a 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -63,6 +63,7 @@
 
 <script>
 import { useField } from "vee-validate";
+import { toRef } from "vue";
 import { queryStrings } from "@/constants/query-strings";
 
 export default {
@@ -177,7 +178,7 @@ export default {
     },
     selectedValues(newVal) {
       if (typeof newVal === "string") {
-        this.handleChange(this.value);
+        this.handleChange(newVal);
         this.checkValue = newVal == this.value;
       }
       else if (newVal !== undefined) {
@@ -203,8 +204,8 @@ export default {
     const {
         handleChange,
         errors,
-    } = useField(props.groupName, props.validationRules, fieldOptions);
-
+    } = useField(toRef(props, "groupName"), toRef(props, "validationRules"), fieldOptions); 
+    
     return {
       handleChange,
       errors,
diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
index 8b90bd83d..6daf6b972 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/ux-components/radio/radio.vue
@@ -24,7 +24,6 @@
 </template>
 
 <script>
-import { toRefs } from "vue";
 import { useField } from "vee-validate";
 export default {
   name: "radio",