diff --git a/api/setup/analyzeMenuUrl.cfm b/api/setup/analyzeMenuUrl.cfm
index 37a167c..9eb5a55 100644
--- a/api/setup/analyzeMenuUrl.cfm
+++ b/api/setup/analyzeMenuUrl.cfm
@@ -283,12 +283,36 @@
                         <cfif findNoCase('<span id="line', pageHtml)>
                             <cfset ooExtractHtml2 = reReplace(pageHtml, "<[^>]+>", "", "all")>
                         </cfif>
-                        <cfset ooStateMatch = reMatchNoCase("window\.__OO_STATE__\s*=\s*(\{.*?\});\s*window\.", ooExtractHtml2)>
-                        <cfif arrayLen(ooStateMatch)>
-                            <cfset ooStateJson = reReplaceNoCase(ooStateMatch[1], "window\.__OO_STATE__\s*=\s*", "")>
-                            <cfset ooStateJson = reReplace(ooStateJson, ";\s*window\.$", "")>
+                        <cfscript>
+                            ooStateJson2 = "";
+                            ooStart2 = findNoCase("window.__OO_STATE__", ooExtractHtml2);
+                            if (ooStart2 > 0) {
+                                var bs2 = find("{", ooExtractHtml2, ooStart2);
+                                if (bs2 > 0) {
+                                    var d2 = 0; var inS2 = false; var esc2 = false; var be2 = 0;
+                                    for (var i2 = bs2; i2 <= len(ooExtractHtml2); i2++) {
+                                        var c2 = mid(ooExtractHtml2, i2, 1);
+                                        if (esc2) { esc2 = false; continue; }
+                                        if (c2 == chr(92) && inS2) { esc2 = true; continue; }
+                                        if (c2 == '"') { inS2 = !inS2; continue; }
+                                        if (!inS2) {
+                                            if (c2 == "{") d2 = d2 + 1;
+                                            else if (c2 == "}") { d2 = d2 - 1; if (d2 == 0) { be2 = i2; break; } }
+                                        }
+                                    }
+                                    if (be2 > 0) ooStateJson2 = mid(ooExtractHtml2, bs2, be2 - bs2 + 1);
+                                }
+                            }
+                            if (len(ooStateJson2)) {
+                                ooStateJson2 = replace(ooStateJson2, "&amp;", "&", "all");
+                                ooStateJson2 = replace(ooStateJson2, "&lt;", "<", "all");
+                                ooStateJson2 = replace(ooStateJson2, "&gt;", ">", "all");
+                                ooStateJson2 = replace(ooStateJson2, "&quot;", '"', "all");
+                            }
+                        </cfscript>
+                        <cfif len(ooStateJson2)>
                             <cftry>
-                                <cfset ooState = deserializeJSON(ooStateJson)>
+                                <cfset ooState = deserializeJSON(ooStateJson2)>
                                 <!--- Debug: log all top-level keys in OO_STATE --->
                                 <cfset ooStateKeys = structKeyList(ooState)>
                                 <cfset arrayAppend(response.steps, "OO_STATE keys: " & left(ooStateKeys, 500))>
@@ -567,10 +591,34 @@
                                     <cfif findNoCase('<span id="line', otherHtml)>
                                         <cfset otherCleanHtml = reReplace(otherHtml, "<[^>]+>", "", "all")>
                                     </cfif>
-                                    <cfset otherOoMatch = reMatchNoCase("window\.__OO_STATE__\s*=\s*(\{.*?\});\s*window\.", otherCleanHtml)>
-                                    <cfif arrayLen(otherOoMatch)>
-                                        <cfset otherOoJson = reReplaceNoCase(otherOoMatch[1], "window\.__OO_STATE__\s*=\s*", "")>
-                                        <cfset otherOoJson = reReplace(otherOoJson, ";\s*window\.$", "")>
+                                    <cfscript>
+                                        otherOoJson = "";
+                                        var otherOoStart = findNoCase("window.__OO_STATE__", otherCleanHtml);
+                                        if (otherOoStart > 0) {
+                                            var obs = find("{", otherCleanHtml, otherOoStart);
+                                            if (obs > 0) {
+                                                var od = 0; var ois = false; var oesc = false; var obe = 0;
+                                                for (var oi = obs; oi <= len(otherCleanHtml); oi++) {
+                                                    var oc = mid(otherCleanHtml, oi, 1);
+                                                    if (oesc) { oesc = false; continue; }
+                                                    if (oc == chr(92) && ois) { oesc = true; continue; }
+                                                    if (oc == '"') { ois = !ois; continue; }
+                                                    if (!ois) {
+                                                        if (oc == "{") od = od + 1;
+                                                        else if (oc == "}") { od = od - 1; if (od == 0) { obe = oi; break; } }
+                                                    }
+                                                }
+                                                if (obe > 0) otherOoJson = mid(otherCleanHtml, obs, obe - obs + 1);
+                                            }
+                                        }
+                                        if (len(otherOoJson)) {
+                                            otherOoJson = replace(otherOoJson, "&amp;", "&", "all");
+                                            otherOoJson = replace(otherOoJson, "&lt;", "<", "all");
+                                            otherOoJson = replace(otherOoJson, "&gt;", ">", "all");
+                                            otherOoJson = replace(otherOoJson, "&quot;", '"', "all");
+                                        }
+                                    </cfscript>
+                                    <cfif len(otherOoJson)>
                                         <cftry>
                                             <cfset otherOoState = deserializeJSON(otherOoJson)>
                                             <cfloop collection="#otherOoState#" item="otherKey">
@@ -955,10 +1003,45 @@
             <cfif findNoCase('<span id="line', pageHtml)>
                 <cfset ooExtractHtml = reReplace(pageHtml, "<[^>]+>", "", "all")>
             </cfif>
-            <cfset ooStateMatch = reMatchNoCase("window\.__OO_STATE__\s*=\s*(\{.*?\});\s*window\.", ooExtractHtml)>
-            <cfif arrayLen(ooStateMatch)>
-                <cfset ooStateJson = reReplaceNoCase(ooStateMatch[1], "window\.__OO_STATE__\s*=\s*", "")>
-                <cfset ooStateJson = reReplace(ooStateJson, ";\s*window\.$", "")>
+            <!--- Extract JSON using brace-counting (regex .*? fails on 500K+ JSON due to backtracking) --->
+            <cfscript>
+                ooStateJson = "";
+                ooStartPos = findNoCase("window.__OO_STATE__", ooExtractHtml);
+                if (ooStartPos > 0) {
+                    braceStart = find("{", ooExtractHtml, ooStartPos);
+                    if (braceStart > 0) {
+                        var depth = 0;
+                        var inStr = false;
+                        var esc = false;
+                        var braceEnd = 0;
+                        var totalLen = len(ooExtractHtml);
+                        for (var ci = braceStart; ci <= totalLen; ci++) {
+                            var ch = mid(ooExtractHtml, ci, 1);
+                            if (esc) { esc = false; continue; }
+                            if (ch == chr(92) && inStr) { esc = true; continue; }
+                            if (ch == '"') { inStr = !inStr; continue; }
+                            if (!inStr) {
+                                if (ch == "{") depth = depth + 1;
+                                else if (ch == "}") {
+                                    depth = depth - 1;
+                                    if (depth == 0) { braceEnd = ci; break; }
+                                }
+                            }
+                        }
+                        if (braceEnd > 0) {
+                            ooStateJson = mid(ooExtractHtml, braceStart, braceEnd - braceStart + 1);
+                        }
+                    }
+                }
+                // Decode HTML entities from View Source (Chrome encodes & as &amp; etc.)
+                if (len(ooStateJson)) {
+                    ooStateJson = replace(ooStateJson, "&amp;", "&", "all");
+                    ooStateJson = replace(ooStateJson, "&lt;", "<", "all");
+                    ooStateJson = replace(ooStateJson, "&gt;", ">", "all");
+                    ooStateJson = replace(ooStateJson, "&quot;", '"', "all");
+                }
+            </cfscript>
+            <cfif len(ooStateJson)>
                 <cfset ooState = deserializeJSON(ooStateJson)>
 
                 <cfset toastBusiness = structNew()>