diff --git a/api/setup/analyzeMenuUrl.cfm b/api/setup/analyzeMenuUrl.cfm
index 6336968..1511a93 100644
--- a/api/setup/analyzeMenuUrl.cfm
+++ b/api/setup/analyzeMenuUrl.cfm
@@ -397,7 +397,9 @@
                                                                 <cfif structKeyExists(item, "name")>
                                                                     <cfset itemCategoryMap[item.name] = effectiveName>
                                                                     <!--- Extract price --->
-                                                                    <cfif structKeyExists(item, "price") AND isNumeric(item.price)>
+                                                                    <cfif structKeyExists(item, "prices") AND isArray(item.prices) AND arrayLen(item.prices) GT 0 AND isNumeric(item.prices[1])>
+                                                                        <cfset itemPriceMap[item.name] = val(item.prices[1])>
+                                                                    <cfelseif structKeyExists(item, "price") AND isNumeric(item.price)>
                                                                         <cfset itemPriceMap[item.name] = val(item.price)>
                                                                     <cfelseif structKeyExists(item, "unitPrice") AND isNumeric(item.unitPrice)>
                                                                         <cfset itemPriceMap[item.name] = val(item.unitPrice)>
@@ -450,7 +452,9 @@
                                                                 <cfset itemCategoryMap[item.name] = groupName>
                                                             </cfif>
                                                             <!--- Extract price - try multiple field names --->
-                                                            <cfif structKeyExists(item, "price") AND isNumeric(item.price)>
+                                                            <cfif structKeyExists(item, "prices") AND isArray(item.prices) AND arrayLen(item.prices) GT 0 AND isNumeric(item.prices[1])>
+                                                                <cfset itemPriceMap[item.name] = val(item.prices[1])>
+                                                            <cfelseif structKeyExists(item, "price") AND isNumeric(item.price)>
                                                                 <cfset itemPriceMap[item.name] = val(item.price)>
                                                             <cfelseif structKeyExists(item, "unitPrice") AND isNumeric(item.unitPrice)>
                                                                 <cfset itemPriceMap[item.name] = val(item.unitPrice)>
@@ -1052,11 +1056,24 @@
                             </cfif>
                             <cfif structKeyExists(restaurant, "location") AND isStruct(restaurant.location)>
                                 <cfset loc = restaurant.location>
-                                <cfif structKeyExists(loc, "address1")>
+                                <cfif structKeyExists(loc, "address1") AND NOT isNull(loc.address1)>
+                                    <cfset toastBusiness["addressLine1"] = loc.address1>
                                     <cfset toastBusiness["address"] = loc.address1>
-                                    <cfif structKeyExists(loc, "city") AND NOT isNull(loc.city)><cfset toastBusiness["address"] = toastBusiness.address & ", " & loc.city></cfif>
-                                    <cfif structKeyExists(loc, "state") AND NOT isNull(loc.state)><cfset toastBusiness["address"] = toastBusiness.address & ", " & loc.state></cfif>
-                                    <cfif structKeyExists(loc, "zip") AND NOT isNull(loc.zip)><cfset toastBusiness["address"] = toastBusiness.address & " " & loc.zip></cfif>
+                                    <cfif structKeyExists(loc, "city") AND NOT isNull(loc.city)>
+                                        <cfset toastBusiness["city"] = loc.city>
+                                        <cfset toastBusiness["address"] = toastBusiness.address & ", " & loc.city>
+                                    </cfif>
+                                    <cfif structKeyExists(loc, "state") AND NOT isNull(loc.state)>
+                                        <cfset toastBusiness["state"] = loc.state>
+                                        <cfset toastBusiness["address"] = toastBusiness.address & ", " & loc.state>
+                                    </cfif>
+                                    <cfif structKeyExists(loc, "zip") AND NOT isNull(loc.zip)>
+                                        <cfset toastBusiness["zip"] = loc.zip>
+                                        <cfset toastBusiness["address"] = toastBusiness.address & " " & loc.zip>
+                                    <cfelseif structKeyExists(loc, "zipCode") AND NOT isNull(loc.zipCode)>
+                                        <cfset toastBusiness["zip"] = loc.zipCode>
+                                        <cfset toastBusiness["address"] = toastBusiness.address & " " & loc.zipCode>
+                                    </cfif>
                                 </cfif>
                                 <cfif structKeyExists(loc, "phone") AND NOT isNull(loc.phone)>
                                     <cfset toastBusiness["phone"] = loc.phone>
@@ -1307,7 +1324,7 @@
                     <cftry>
                         <!--- Determine Toast URL for Playwright --->
                         <cfset toastUrl = "">
-                        <cfif isDefined("targetUrl") AND reFindNoCase("order\.toasttab\.com", targetUrl)>
+                        <cfif isDefined("targetUrl") AND reFindNoCase("toasttab\.com", targetUrl)>
                             <!--- URL mode: use original URL --->
                             <cfset toastUrl = targetUrl>
                         <cfelse>
@@ -1316,14 +1333,14 @@
                             <cfset slugMatch = reMatchNoCase('"shortUrl"\s*:\s*"([^"]+)"', pageHtml)>
                             <cfif arrayLen(slugMatch)>
                                 <cfset slug = reReplaceNoCase(slugMatch[1], '.*"shortUrl"\s*:\s*"([^"]+)".*', '\1')>
-                                <cfset toastUrl = "https://order.toasttab.com/online/" & slug>
+                                <cfset toastUrl = "https://www.toasttab.com/local/order/" & slug>
                             </cfif>
                             <!--- Try gift card URL pattern --->
                             <cfif NOT len(toastUrl)>
                                 <cfset giftMatch = reMatchNoCase('toasttab\.com/([a-zA-Z0-9_-]+)/giftcards', pageHtml)>
                                 <cfif arrayLen(giftMatch)>
                                     <cfset slug = reReplaceNoCase(giftMatch[1], '.*toasttab\.com/([a-zA-Z0-9_-]+)/giftcards.*', '\1')>
-                                    <cfset toastUrl = "https://order.toasttab.com/online/" & slug>
+                                    <cfset toastUrl = "https://www.toasttab.com/local/order/" & slug>
                                 </cfif>
                             </cfif>
                         </cfif>