diff --git a/playwright-tests/tests/mockResponses/0001a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-defense.json b/playwright-tests/tests/mockResponses/0001a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-repel.json
similarity index 100%
rename from playwright-tests/tests/mockResponses/0001a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-defense.json
rename to playwright-tests/tests/mockResponses/0001a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-repel.json
diff --git a/playwright-tests/tests/mockResponses/0002a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-defense.json b/playwright-tests/tests/mockResponses/0002a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-repel.json
similarity index 100%
rename from playwright-tests/tests/mockResponses/0002a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-defense.json
rename to playwright-tests/tests/mockResponses/0002a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-repel.json
diff --git a/playwright-tests/tests/mockResponses/mockResponsesConfig.json b/playwright-tests/tests/mockResponses/mockResponsesConfig.json
index b0dc208d..f121da14 100644
--- a/playwright-tests/tests/mockResponses/mockResponsesConfig.json
+++ b/playwright-tests/tests/mockResponses/mockResponsesConfig.json
@@ -19,7 +19,7 @@
         "location/api/v1/location/providers/75023/Replace/100/550036/true/CR00056707/DW01571GTNNOEM": "0002a_Advanced_Replace_Deductible_Client/location/api/v1/location/providers/75023/Replace/100/550036/true/CR00056707/DW01571GTNNOEM.json",
         "schedule/api/v1/schedule/shop-time-slots": "0002a_Advanced_Replace_Deductible_Client/schedule/api/v1/schedule/shop-time-slots.json",
         "location/api/v1/location/alert-reasons/01813": "0002a_Advanced_Replace_Deductible_Client/location/api/v1/location/alert-reasons/01813.json",
-        "parts/api/v1/parts/rain-defense": "0002a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-defense.json",
+        "parts/api/v1/parts/rain-repel": "0002a_Advanced_Replace_Deductible_Client/parts/api/v1/parts/rain-repel.json",
         "price/api/v1/price/combined-quote": "0002a_Advanced_Replace_Deductible_Client/price/api/v1/price/combined-quote.json"
     }
 }
\ No newline at end of file
diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 3750f194..055b56b4 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -97,7 +97,7 @@ const endpoints = Object.freeze({
         method: 'GET'
     },
     GetRainDefense: {
-        url: `${PARTS_BASE_URL}/rain-defense`,
+        url: `${PARTS_BASE_URL}/rain-repel`,
         method: 'GET'
     },
     GetRecalParts: {
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index 8905db79..2f5f4473 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -112,11 +112,16 @@ export default {
 
         const { feeItems } = store.order.lineItems;
 
-        const availableLineItems = [
-            resultMap.rainDefense,
-            ...resultMap.wipers,
-            ...feeItems
-        ];
+        let availableLineItems = [];
+
+        if ( resultMap?.rainDefense?.length > 0 )
+            availableLineItems.push(resultMap.rainDefense);
+
+        if ( resultMap?.wipers?.length > 0 )
+            availableLineItems.push(...resultMap.wipers);
+
+        if ( feeItems?.length > 0 )
+            availableLineItems.push(...feeItems);
 
         let hasBailedOut = false;
         await store.getCombinedQuote(availableLineItems)
@@ -195,7 +200,6 @@ export default {
     }
 };
 </script>
-
 <style lang="scss" scoped>
 .iss-heritage-container-width {
     .service-packages-container {
diff --git a/src/store/index.js b/src/store/index.js
index f11b6933..78b686cd 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1242,6 +1242,17 @@ export const useMainStore = defineStore({
             if (availableLineItems && availableLineItems.length > 0) {
                 const { vehicle, serviceLocation, policy, eon, referralNumber, referralDate, referralSequenceNumber, lineItems } = this.order;
 
+                const availableLineItemsFiltered = availableLineItems.filter((lineItem) => {
+                    if ( lineItem.partNumber )
+                        return true;
+                    else
+                        return false;
+                });
+
+                const lineItemsWithOnlyPartNumbers = availableLineItemsFiltered.map((lineItem) => {
+                    return {partNumber: lineItem.partNumber};
+                });
+
                 const payload = {
                     ParentAccountNumber: this.order.parentAccountNumber,
                     BillToAccountNumber: this.billToAccountNumber,
@@ -1259,7 +1270,7 @@ export const useMainStore = defineStore({
                     ServiceZipCode: serviceLocation.zipCode,
                     IsReplacement: !this.isRepair,
                     ServerData: lineItems.serverData,
-                    LineItems: getLineItemsFlattened(availableLineItems),
+                    LineItems: lineItemsWithOnlyPartNumbers,
                     FeatureToggles: getFeatureTogglesPayloadObject(this.experimentSettings)
                 };