diff --git a/src/lib/components/Table/Table.svelte b/src/lib/components/Table/Table.svelte
index 2bebea2d..d1633986 100644
--- a/src/lib/components/Table/Table.svelte
+++ b/src/lib/components/Table/Table.svelte
@@ -49,7 +49,7 @@
   let downloadWorker: Worker | undefined;
   let checkedItems;
 
-  let stockList = rawData?.slice(0, 150);
+  let stockList = originalData?.slice(0, 150);
   let scrollPosition = 0;
   //$: stockList = originalData.slice(0, 150);
 
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 61e3d56d..d6377a05 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -194,20 +194,21 @@ export const groupNews = (news, watchList) => {
 };
 
 
-export const calculateChange = (oldList?: any[], newList?: any[]) => {
-  if (!oldList?.length || !newList?.length) return [...(oldList || [])];
+export const calculateChange = (oldList = [], newList = []) => {
+  if (!oldList.length || !newList.length) return [...oldList];
 
+  // Create a Map for fast lookups of new list items by symbol
   const newListMap = new Map(newList.map((item) => [item.symbol, item]));
-  const updatedList = [];
 
-  for (let i = 0; i < oldList.length; i++) {
-    const item = oldList[i];
+  return oldList.map((item) => {
     const newItem = newListMap.get(item.symbol);
 
-    if (newItem?.avgPrice) {
+    // Check if the symbols match and the newItem has the necessary properties
+    if (newItem && newItem.symbol === item.symbol && newItem.avgPrice) {
       const { price, changesPercentage } = item;
       const newPrice = newItem.avgPrice;
 
+      // Only update the changesPercentage if both price and changesPercentage are defined
       if (price != null && changesPercentage != null) {
         const baseLine = price / (1 + Number(changesPercentage) / 100);
         item.changesPercentage = ((newPrice / baseLine - 1) * 100);
@@ -217,40 +218,42 @@ export const calculateChange = (oldList?: any[], newList?: any[]) => {
       item.price = newPrice;
     }
 
-    updatedList.push(item);
-  }
-
-  return updatedList;
+    return item;
+  });
 };
 
 
 
-export function updateStockList(stockList, originalData) {
-    // Create a Map for O(1) lookup of original data by symbol
-    const originalDataMap = new Map(
-        originalData?.map(item => [item.symbol, item])
-    );
+export function updateStockList(stockList = [], originalData = []) {
+  // Create a Map for fast O(1) lookups of original data by symbol
+  const originalDataMap = new Map(originalData.map(item => [item.symbol, item]));
 
-    // Use .map() to create a new array with updated stocks
-    return stockList?.map(stock => {
-        // Find matching stock in originalData
-        const matchingStock = originalDataMap?.get(stock?.symbol);
+  // Initialize an array to store the updated stock list
+  const updatedStockList = [];
 
-        // If a match is found, update price and changesPercentage
-        if (matchingStock) {
-            return {
-                ...stock,
-                price: matchingStock?.price,
-                changesPercentage: matchingStock?.changesPercentage,
-                previous: matchingStock?.previous ?? null,
-            };
-        }
+  // Iterate through each stock in the stockList
+  for (let i = 0; i < stockList.length; i++) {
+    const stock = stockList[i];
+    const matchingStock = originalDataMap?.get(stock?.symbol);
+    // If a matching stock is found, update it
+    if (matchingStock) {
+      updatedStockList.push({
+        ...stock,
+        price: matchingStock.price,
+        changesPercentage: matchingStock.changesPercentage,
+        previous: matchingStock.previous ?? null,
+      });
+    } else {
+      // If no match, add the stock unchanged
+      updatedStockList.push(stock);
+    }
+  }
 
-        // If no match, return the original stock object unchanged
-        return stock;
-    });
+  // Return the updated stock list
+  return updatedStockList;
 }
 
+
 export const flyAndScale = (
   node: Element,
   params: FlyAndScaleParams = { y: -8, x: 0, start: 0.95, duration: 0 },
diff --git a/src/routes/etf/[tickerID]/holdings/+page.server.ts b/src/routes/etf/[tickerID]/holdings/+page.server.ts
index ffcd540a..abdc5267 100644
--- a/src/routes/etf/[tickerID]/holdings/+page.server.ts
+++ b/src/routes/etf/[tickerID]/holdings/+page.server.ts
@@ -1,5 +1,5 @@
 export const load = async ({ locals, params }) => {
-  const { apiKey, apiURL, user } = locals;
+  const { apiKey, apiURL } = locals;
   const getETFHoldings = async () => {
     const postData = {
       ticker: params.tickerID,
@@ -17,6 +17,7 @@ export const load = async ({ locals, params }) => {
 
     const output = await response.json();
 
+
     return output;
   };
 
diff --git a/src/routes/etf/[tickerID]/holdings/+page.svelte b/src/routes/etf/[tickerID]/holdings/+page.svelte
index c7c3ee7e..a5284765 100644
--- a/src/routes/etf/[tickerID]/holdings/+page.svelte
+++ b/src/routes/etf/[tickerID]/holdings/+page.svelte
@@ -8,7 +8,8 @@
   import Table from "$lib/components/Table/Table.svelte";
 
   export let data;
-  let rawData = data?.getETFHoldings?.holdings || [];
+  let rawData = data?.getETFHoldings?.holdings;
+
   const lastUpdate = new Date(data?.getETFHoldings?.lastUpdate);
   const options = { month: "short", day: "numeric", year: "numeric" };
   const formattedDate = lastUpdate?.toLocaleDateString("en-US", options);
diff --git a/src/routes/list/market-cap/[slug]/+page.svelte b/src/routes/list/market-cap/[slug]/+page.svelte
index 9a6974e3..c6abcfee 100644
--- a/src/routes/list/market-cap/[slug]/+page.svelte
+++ b/src/routes/list/market-cap/[slug]/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { abbreviateNumber } from "$lib/utils";
   import Table from "$lib/components/Table/Table.svelte";
-  import { screenWidth } from "$lib/store";
   import { page } from "$app/stores";
 
   export let data;