diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index cdfc5f261..06776174f 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -93,8 +93,8 @@ export default {
                 for (let partOrQuestion of partsOrQuestions) {
                     if (this.hasCapabilityQuestions([partOrQuestion])) {
                         let capabilityQuestionsForGlassLocation = (await baseMixin.methods.dispatchStoreAction(storeActions.GET_CAPABILITY_QUESTIONS, {
-                            carId: "CR00064847", // store.getters.vehicle.carId,
-                            partNumber: "DW01929GBYN" // glassLocationWithCapabilityQuestion.parts[0].partNumber
+                            carId: store.getters.vehicle.carId,
+                            partNumber: partOrQuestion.parts[0].partNumber
                         })).data;
 
                         capabilityQuestionsForGlassLocation.forEach(question => {