diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 6a235ef8a..2f7d3e0a1 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -173,11 +173,16 @@ export default {
       if(this.selectingInitiatesLoad) {
         this.selectedValues = val.value;
       } else {
-        if(Array.isArray(this.selectedValues)) {
+        if(this.isMultiSelect) {
           const newSelectedValues = this.selectedValues;
           val.checkValue ? newSelectedValues.push(val.value) : newSelectedValues.splice(newSelectedValues.indexOf(val.value), 1);
           this.selectedValues = newSelectedValues;
         }
+        else if (Array.isArray(this.selectedValues)) {          
+          this.selectedValues[0] = val.value;
+          const temp = this.selectedValues;
+          this.selectedValues = temp;
+        }
         else {
           this.selectedValues = val.value;
         }
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
index 25d273eca..31a681857 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
@@ -47,7 +47,8 @@ export default ({
                 return this.modelValue;
             },
             set: function(newValue) {
-                this.$emit("update:modelValue", newValue);
+                const numberValue = Number(newValue);
+                this.$emit("update:modelValue", numberValue);
             }
         },
     },
diff --git a/src/store/index.js b/src/store/index.js
index dd2a59683..95dd63ef7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -942,8 +942,14 @@ export const actions = {
         .slice()
         .sort()
         .every((obj, index) => obj.glassLocation === selectedGlassPassedInSorted[index].glassLocation && obj.glassName === selectedGlassPassedInSorted[index].glassName);
+    const isWindshieldRepairTheSame = isWindshieldRepair === context.state.order.damage.isRepair;
+    const isChipCountTheSame = Array.isArray(selectedWindshieldChipCount) //TODO: fix the underlying components so this is never an array
+      ? selectedWindshieldChipCount[0] === context.state.order.damage.numberOfChips
+      : selectedWindshieldChipCount === context.state.order.damage.numberOfChips;
 
-    if (!isGlassToReplaceTheSame) {
+    const isDamageChanging = !isGlassToReplaceTheSame || !isWindshieldRepairTheSame || (isWindshieldRepair && !isChipCountTheSame);
+
+    if (isDamageChanging) {
       //Reset dependent state when changing
       context.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES);
 
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
index 94bd59534..c037cb3b7 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -122,7 +122,7 @@ export default {
     handleCheckChange() {
       const emitEvent = {
         checkValue: this.checkValue, // only read on checkboxes, on handleCheckedChanged on button-question
-        value: this.value.toString(),
+        value: this.value,
         buttonId: this.buttonID && this.buttonID.toString(),
       };