diff --git a/src/store/index.js b/src/store/index.js
index 48f3a06a..8cfc4f4d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -22,12 +22,11 @@ import {
     repairWaivedForSelectedVehicle
 } from '@/helpers/policy-vehicle-helper';
 import { buildURLSearchParams, getPartNumbersListForQueryString } from '@/helpers/querystring-helper';
-import { getTopLevelGlassPartsWithRecal, isRecalPartOrHasChildRecalPart } from '@/helpers/recal-helper';
+import { getTopLevelGlassPartsWithRecal } from '@/helpers/recal-helper';
 import { getDateForSavedSessionTimeout } from '@/helpers/session-helper';
 import { isMobileDevice } from '@/helpers/useragent-helper';
 import issPageValues from '@/router/router-constants/issPage-values';
 import CoverageStatuses from '@/constants/coverage-statuses';
-import { buildQueryStringParameterFromArrayOfComplexObjects } from '@/helpers/querystring-helper';
 
 const storeId = 'main';
 
@@ -1346,72 +1345,28 @@ export const useMainStore = defineStore({
         },
 
         getServiceabilityDetails(serviceZipCode) {
-            const { vehicle, damage, parentAccountNumber, referralSequenceNumber } = this.order;
-            const escapeRecalibrationType = (rt) => rt.split("&").join("%26");
-
-            const partialLineItemsObjects = this.order.lineItems.glassParts?.map(
-                (lineItem) => ({
-                    partNumber: lineItem.partNumber,
-                    recalibrationType:
-                        lineItem.recalibrationType && isRecalPartOrHasChildRecalPart(lineItem)
-                            ? escapeRecalibrationType(lineItem.recalibrationType)
-                            : undefined,
-                })
-            );
-
-            var lineItems = null;
-            if (partialLineItemsObjects) {
-                lineItems = buildQueryStringParameterFromArrayOfComplexObjects(
-                    partialLineItemsObjects,
-                    "lineItems"
-                );
-            }
-
-            const carId = vehicle.carId;
+            const { vehicle, damage, parentAccountNumber, referralSequenceNumber, lineItems } = this.order;
+            const { carId } = vehicle;
             const glassArray = convertGlassPieceNamingForApi(damage.glassToReplace);
+            const lineItemParts = [...(lineItems.glassParts || []), ...(lineItems.supportingItems || [])].map((part) => ({
+                partNumber: part.partNumber,
+                recalibrationType: part.recalibrationType
+            }));
 
-            const glassPieces = buildQueryStringParameterFromArrayOfComplexObjects(
-                glassArray,
-                "glassPieces"
-            );
-
-            var endPoint = `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&carId=${carId}&parentAccountNumber=${parentAccountNumber}&referralSequenceNumber=${referralSequenceNumber}&applicationName=${applicationConfig.ANALYTICS_APPLICATION_NAME}`;
-            if (lineItems) {
-                endPoint += `&${lineItems}`;
-            }
-
-            if (glassPieces) {
-                endPoint += `&${glassPieces}`;
-            }
-
-            endPoint += `&isHeavyTruckVehicle=${vehicle.isBigTruck}`;
+            const params = buildURLSearchParams({
+                applicationName: applicationConfig.APPLICATION_NAME,
+                parentAccountNumber,
+                referralSequenceNumber,
+                zip: serviceZipCode,
+                carId,
+                glassPieces: glassArray,
+                lineItems: lineItemParts
+            });
 
             return globalMethods.callHttpClient({
                 method: endpoints.GetServiceabilityDetails.method,
-                endpoint: endPoint
-        });
-            // const { vehicle, damage, parentAccountNumber, referralSequenceNumber, lineItems } = this.order;
-            // const { carId } = vehicle;
-            // const glassArray = convertGlassPieceNamingForApi(damage.glassToReplace);
-            // const lineItemParts = [...(lineItems.glassParts || []), ...(lineItems.supportingItems || [])].map((part) => ({
-            //     partNumber: part.partNumber,
-            //     recalibrationType: part.recalibrationType
-            // }));
-
-            // const params = buildURLSearchParams({
-            //     applicationName: applicationConfig.APPLICATION_NAME,
-            //     parentAccountNumber,
-            //     referralSequenceNumber,
-            //     zip: serviceZipCode,
-            //     carId,
-            //     glassPieces: glassArray,
-            //     lineItems: lineItemParts
-            // });
-
-            // return globalMethods.callHttpClient({
-            //     method: endpoints.GetServiceabilityDetails.method,
-            //     endpoint: `${endpoints.GetServiceabilityDetails.url}?${params.toString()}`
-            // });
+                endpoint: `${endpoints.GetServiceabilityDetails.url}?${params.toString()}`
+            });
         },
         lookupVehicleByVin(vin) {
             return globalMethods.callHttpClient({