diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json
index 77fb9cfbc06..1c52ba5c7fb 100644
--- a/esp/src/package-lock.json
+++ b/esp/src/package-lock.json
@@ -14,20 +14,20 @@
         "@fluentui/react-experiments": "8.14.95",
         "@fluentui/react-hooks": "8.6.29",
         "@fluentui/react-icons-mdl2": "1.3.47",
-        "@hpcc-js/chart": "2.81.7",
-        "@hpcc-js/codemirror": "2.60.12",
-        "@hpcc-js/common": "2.71.12",
-        "@hpcc-js/comms": "2.84.4",
+        "@hpcc-js/chart": "2.81.8",
+        "@hpcc-js/codemirror": "2.60.13",
+        "@hpcc-js/common": "2.71.13",
+        "@hpcc-js/comms": "2.84.5",
         "@hpcc-js/dataflow": "8.1.6",
-        "@hpcc-js/eclwatch": "2.73.27",
-        "@hpcc-js/graph": "2.85.8",
-        "@hpcc-js/html": "2.42.13",
-        "@hpcc-js/layout": "2.49.12",
-        "@hpcc-js/map": "2.77.11",
-        "@hpcc-js/other": "2.15.12",
-        "@hpcc-js/phosphor": "2.16.12",
-        "@hpcc-js/react": "2.53.9",
-        "@hpcc-js/tree": "2.40.12",
+        "@hpcc-js/eclwatch": "2.73.29",
+        "@hpcc-js/graph": "2.85.9",
+        "@hpcc-js/html": "2.42.14",
+        "@hpcc-js/layout": "2.49.13",
+        "@hpcc-js/map": "2.77.12",
+        "@hpcc-js/other": "2.15.13",
+        "@hpcc-js/phosphor": "2.16.13",
+        "@hpcc-js/react": "2.53.10",
+        "@hpcc-js/tree": "2.40.13",
         "@hpcc-js/util": "2.50.6",
         "@kubernetes/client-node": "0.18.1",
         "clipboard": "2.0.11",
@@ -1528,35 +1528,35 @@
       }
     },
     "node_modules/@hpcc-js/api": {
-      "version": "2.12.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.12.12.tgz",
-      "integrity": "sha512-2IFnpSZgS4Fuq4uJWBK7rdWlNBpYK5Tjy+5mjntwzC2zcJLzOl3GGvUfLdW3+so5xzu2PpvpTQxpeqQkkpEIXA==",
+      "version": "2.12.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.12.13.tgz",
+      "integrity": "sha512-Koz38zwLENxc9DTb/Ns6yBIiAvv3LX+fLANhBJz9qF7d213x7gmcpo/eKhCw5TsqKEC2uT/kIHppyJRNHSbqPA==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.12"
+        "@hpcc-js/common": "^2.71.13"
       }
     },
     "node_modules/@hpcc-js/chart": {
-      "version": "2.81.7",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.81.7.tgz",
-      "integrity": "sha512-blJb1RLwxSbz2OU8tYra81y7dgvcNjYBk8UZkxdjZuL3S5lpuUFjt+4JIk4zzT/E92IXcy0laYOEU7pt7pLQGA==",
+      "version": "2.81.8",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.81.8.tgz",
+      "integrity": "sha512-kqt9vIFChbz/hDYgUa6ETCsWYzywF2rlsc/qr97GIpr6WbukERlBz7X+ZiYwEocRgNTcy6ka+oAOsgLs/i277g==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.12",
-        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/api": "^2.12.13",
+        "@hpcc-js/common": "^2.71.13",
         "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/codemirror": {
-      "version": "2.60.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.60.12.tgz",
-      "integrity": "sha512-/GPDLlmvSp5ehIC5X5NMZBPVMNZ5WNEPvagFHlxdvKPZzPwI8rmc+0PuCekcueqGm1VdT7arE9PRtRRl/UctnA==",
+      "version": "2.60.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.60.13.tgz",
+      "integrity": "sha512-VDSo3B9RI2QSgY1NuLIvKP9J9BFPRGRMX1Eaje7mvxqFN/K7Vh7BLUnsWTCLWsNWGMDuWVVMzm1pFLkA/x08Zg==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.12"
+        "@hpcc-js/common": "^2.71.13"
       }
     },
     "node_modules/@hpcc-js/common": {
-      "version": "2.71.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.71.12.tgz",
-      "integrity": "sha512-mYK0riwC+vHP3VFp8i9yDQhQytGujbkDcS/LotXtbY8zIu+Um7AgxOaM7eZZlUw1/WrX6ko6ljSK6Q1x5SxtGw==",
+      "version": "2.71.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.71.13.tgz",
+      "integrity": "sha512-db/PADaZb3H5hLnqWX7NDh8hMb3RU65C69cbbNdhdV+dDcvDK637Fnpke5Nk49aFG1iClq66vxOUqqAvAGhc1w==",
       "dependencies": {
         "@hpcc-js/util": "^2.50.6",
         "@types/d3-array": "1.2.10",
@@ -1577,9 +1577,9 @@
       }
     },
     "node_modules/@hpcc-js/comms": {
-      "version": "2.84.4",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.84.4.tgz",
-      "integrity": "sha512-GkKUyttPRYPb/jluoNtxY6jEqJhF2Dr0srzXrF+Vs0biyr4GvwQzMcoQfU97PQl7PJx8M+FUquMchfuQ7sqSWA==",
+      "version": "2.84.5",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.84.5.tgz",
+      "integrity": "sha512-anm1u1ssaQq/cVi9/EGhXW6zcZCMbdQ7wvL3YVcWsxPG7Wyis3gvEZ99pzuRGdqtN5Kmuhm1l4fsolqI4n/F8w==",
       "dependencies": {
         "@hpcc-js/ddl-shim": "^2.20.6",
         "@hpcc-js/util": "^2.50.6",
@@ -1628,11 +1628,11 @@
       }
     },
     "node_modules/@hpcc-js/dgrid": {
-      "version": "2.32.13",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.32.13.tgz",
-      "integrity": "sha512-N6HtJy1uh3tUicHvbqbY2PHk1uqmWM5JSkztzx6AhzqA+Cm5OZIAIXl56QNHhvDZw+1y4QKpu8dxiVLjCe4C0g==",
+      "version": "2.32.14",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.32.14.tgz",
+      "integrity": "sha512-h+xwnILOoM8k6Q+97+Wwx5+Qx+PhXXxL76wQC3qpTolCiQkknb2gUTCDq2/jWOBrP1Gmalxw3dBfFHMz6fNp1A==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/common": "^2.71.13",
         "@hpcc-js/ddl-shim": "^2.20.6",
         "@hpcc-js/dgrid-shim": "^2.24.7",
         "@hpcc-js/util": "^2.50.6"
@@ -1644,63 +1644,63 @@
       "integrity": "sha512-Cras6gFjG957Qe+mbd+p3ZXJZ4wdHCy93sriwVWroq2ZvwLINJ0LQelmp4NA9ctr99pp9WXsI8GsmoQHhQeYIw=="
     },
     "node_modules/@hpcc-js/dgrid2": {
-      "version": "2.3.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid2/-/dgrid2-2.3.12.tgz",
-      "integrity": "sha512-uasaW9CuCXnaEijBuPTopdPJyE0+/uBxyz+DXlH82yWQHZzHJfI6pZGpkXIG4dr1vvvEPT8eAIyVFW5zkbo4/g==",
+      "version": "2.3.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid2/-/dgrid2-2.3.13.tgz",
+      "integrity": "sha512-1MPdZt+kPfukfwOainV3/NKkvkZ4Ox0ooHdOerO8nOnSQqfyjsIrwjHBzfKrwGr8y9vGuBnArgcuLKoh2l7dDg==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/common": "^2.71.13",
         "@hpcc-js/preact-shim": "^2.16.7",
         "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/eclwatch": {
-      "version": "2.73.27",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.73.27.tgz",
-      "integrity": "sha512-0wry0JKkFxVXjP5OTFHbBqtwdnr60Rb5XQVId1kgNisLwTJq71tmyVz6ViBZ9qoMiQsZxtS8px4EJTguDOj4aA==",
-      "dependencies": {
-        "@hpcc-js/codemirror": "^2.60.12",
-        "@hpcc-js/common": "^2.71.12",
-        "@hpcc-js/comms": "^2.84.4",
-        "@hpcc-js/dgrid": "^2.32.13",
-        "@hpcc-js/graph": "^2.85.8",
-        "@hpcc-js/layout": "^2.49.12",
-        "@hpcc-js/phosphor": "^2.16.12",
-        "@hpcc-js/timeline": "^2.51.15",
-        "@hpcc-js/tree": "^2.40.12",
+      "version": "2.73.29",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.73.29.tgz",
+      "integrity": "sha512-Wh6Qlr/p8tsAtsGvynE+PUcspkrr5GrxLdqeLBIIW8LxXkNSCNLKWX48HmDykPxjqWi60SaAzoCoGAH4Il6YDQ==",
+      "dependencies": {
+        "@hpcc-js/codemirror": "^2.60.13",
+        "@hpcc-js/common": "^2.71.13",
+        "@hpcc-js/comms": "^2.84.5",
+        "@hpcc-js/dgrid": "^2.32.14",
+        "@hpcc-js/graph": "^2.85.9",
+        "@hpcc-js/layout": "^2.49.13",
+        "@hpcc-js/phosphor": "^2.16.13",
+        "@hpcc-js/timeline": "^2.51.16",
+        "@hpcc-js/tree": "^2.40.13",
         "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/graph": {
-      "version": "2.85.8",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.85.8.tgz",
-      "integrity": "sha512-mlAfAzPAyY6s/jP0Yizdk2QMoeup4gHpXGpSK9NRa4JWcevr6Pobw2RUuDpQgAqz+B8XXwloVxZhRryyQgrIBA==",
-      "dependencies": {
-        "@hpcc-js/api": "^2.12.12",
-        "@hpcc-js/common": "^2.71.12",
-        "@hpcc-js/html": "^2.42.13",
-        "@hpcc-js/react": "^2.53.9",
+      "version": "2.85.9",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.85.9.tgz",
+      "integrity": "sha512-bsPHK2N6GdK83nvQxgk+xTd83z6qCD5O7gtrSozRuAZ98b1OxVuXeGHPpObk2FDSug2g6/phEBSRQ6NFKD+kfw==",
+      "dependencies": {
+        "@hpcc-js/api": "^2.12.13",
+        "@hpcc-js/common": "^2.71.13",
+        "@hpcc-js/html": "^2.42.14",
+        "@hpcc-js/react": "^2.53.10",
         "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/html": {
-      "version": "2.42.13",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/html/-/html-2.42.13.tgz",
-      "integrity": "sha512-PwmSsDXaBS6eqSeoO5135aKJeUPSwnaJkMwDbcr3Wh9VXxx6sDyEp7PfYF9tBbkoeZL8JvYxZu12Trs8eUt/eA==",
+      "version": "2.42.14",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/html/-/html-2.42.14.tgz",
+      "integrity": "sha512-+QjnhklLKssnSiuTdk3+k2RfqfbXtfFYpla5H5N8S3spFDrZ96LCgAKmc8dRdx7Xe2lOBDPejZAKRyva7XuZcQ==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/common": "^2.71.13",
         "@hpcc-js/preact-shim": "^2.16.7",
         "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/layout": {
-      "version": "2.49.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.49.12.tgz",
-      "integrity": "sha512-ZpUWWA7JYEK8ucqMBibP3ZrKFJXzLtb7PbNgavNOkE7C+uh0P5h0sNXcrHIEwjNNrw06tes7W1lEJUr9cBruJA==",
+      "version": "2.49.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.49.13.tgz",
+      "integrity": "sha512-kxKH2pC89Sl5rrpugQHfB/q3Vl/0G2TAbkEI/CgyxP4A9QSJ+qA/uM/yB+MORPoU7fsbJu9knMYPNzT5k9WvgA==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.12",
-        "@hpcc-js/chart": "^2.81.7",
-        "@hpcc-js/common": "^2.71.12",
-        "@hpcc-js/dgrid2": "^2.3.12"
+        "@hpcc-js/api": "^2.12.13",
+        "@hpcc-js/chart": "^2.81.8",
+        "@hpcc-js/common": "^2.71.13",
+        "@hpcc-js/dgrid2": "^2.3.13"
       }
     },
     "node_modules/@hpcc-js/leaflet-shim": {
@@ -1713,36 +1713,36 @@
       }
     },
     "node_modules/@hpcc-js/map": {
-      "version": "2.77.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.77.11.tgz",
-      "integrity": "sha512-PzilbSsb7DLupxtXMSgnHXMsJNgaRs89lxor0f0n9lINJ+1GO44v1NR12ctJAPgso+f4BGQB5yA4zmw74do+tQ==",
-      "dependencies": {
-        "@hpcc-js/api": "^2.12.12",
-        "@hpcc-js/common": "^2.71.12",
-        "@hpcc-js/graph": "^2.85.8",
-        "@hpcc-js/layout": "^2.49.12",
+      "version": "2.77.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.77.12.tgz",
+      "integrity": "sha512-5GfBMjaF4zhp07YZSP+CpM/sQsiAJtD/G3yyOBq7CKm2PE5bloO+HJ04SPgFyc08t6YPdZDbfUXoOagEy6wTcQ==",
+      "dependencies": {
+        "@hpcc-js/api": "^2.12.13",
+        "@hpcc-js/common": "^2.71.13",
+        "@hpcc-js/graph": "^2.85.9",
+        "@hpcc-js/layout": "^2.49.13",
         "@hpcc-js/leaflet-shim": "^2.3.4",
-        "@hpcc-js/other": "^2.15.12",
+        "@hpcc-js/other": "^2.15.13",
         "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/other": {
-      "version": "2.15.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.15.12.tgz",
-      "integrity": "sha512-a1638W3XsIA05sLs8C/MuDDFvZd1vQEdU6rZK02+aiUprEIniPFG0OekKn6DJRvcEJRNd+vd1SN2ri+lzu27Gg==",
+      "version": "2.15.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.15.13.tgz",
+      "integrity": "sha512-E0WAgxRQVLwRw0jq5p3WF542PWIMe9yZ41hPFlsfBNWC626lJXqs+BQHpVlxRVa3xUzrHezlVzqIQGOxF6qq8w==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.12",
-        "@hpcc-js/common": "^2.71.12",
-        "@hpcc-js/layout": "^2.49.12"
+        "@hpcc-js/api": "^2.12.13",
+        "@hpcc-js/common": "^2.71.13",
+        "@hpcc-js/layout": "^2.49.13"
       }
     },
     "node_modules/@hpcc-js/phosphor": {
-      "version": "2.16.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor/-/phosphor-2.16.12.tgz",
-      "integrity": "sha512-p6pF97D/fSkHXT3uIIqfQCTZf43a9zkRJ5a+fyS8toCBFcskHNM3OdVEYYXChBieTPz4xx2FJwmrBlXmEZ2quw==",
+      "version": "2.16.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor/-/phosphor-2.16.13.tgz",
+      "integrity": "sha512-oMfeL4kp9luMRE9fI72BBbikQ0yqB99H7STkkHwVVGr4bogJJ+QTiepEnW/C9WvAg34CvtkgfAU2USc7RLHMqA==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.12",
-        "@hpcc-js/other": "^2.15.12",
+        "@hpcc-js/common": "^2.71.13",
+        "@hpcc-js/other": "^2.15.13",
         "@hpcc-js/phosphor-shim": "^2.14.6",
         "@hpcc-js/util": "^2.50.6"
       }
@@ -1767,34 +1767,34 @@
       }
     },
     "node_modules/@hpcc-js/react": {
-      "version": "2.53.9",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/react/-/react-2.53.9.tgz",
-      "integrity": "sha512-vox6OEHBuaniA/Tn94yXVwZN5HUa6OXMm/6qpeSpgY1ZfPKvhzr9fjTsOfk7mNFnAMvVK69+AJWh/inCBWZM5w==",
+      "version": "2.53.10",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/react/-/react-2.53.10.tgz",
+      "integrity": "sha512-ihGJuTXlu1jUgIJ066hxMFF7bJUje2TEEPJq+M5Q5xV+pCxCqREVdfC/17HcOgbL9A6Vw6y34cKykLKZOFhRRg==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/common": "^2.71.13",
         "@hpcc-js/preact-shim": "^2.16.7"
       }
     },
     "node_modules/@hpcc-js/timeline": {
-      "version": "2.51.15",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.51.15.tgz",
-      "integrity": "sha512-dtH0UKE/Wmd2IJ7jy40gaYCMMMnxVSFHP4zEgxTV7+IHxxhgWzyGHGpo+zvZnyOqml3RPnIvcMGDfECJ8bmAzQ==",
+      "version": "2.51.16",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.51.16.tgz",
+      "integrity": "sha512-L25WzzBMs4Wsoa4gp43pEcLN43Ig1X9JLA0ZZRafx13ntSptgizkgra+BpuEy7WDB8b9KQWfp+a5xEBpm84OSg==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.12",
-        "@hpcc-js/chart": "^2.81.7",
-        "@hpcc-js/common": "^2.71.12",
-        "@hpcc-js/html": "^2.42.13",
-        "@hpcc-js/layout": "^2.49.12",
-        "@hpcc-js/react": "^2.53.9"
+        "@hpcc-js/api": "^2.12.13",
+        "@hpcc-js/chart": "^2.81.8",
+        "@hpcc-js/common": "^2.71.13",
+        "@hpcc-js/html": "^2.42.14",
+        "@hpcc-js/layout": "^2.49.13",
+        "@hpcc-js/react": "^2.53.10"
       }
     },
     "node_modules/@hpcc-js/tree": {
-      "version": "2.40.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.40.12.tgz",
-      "integrity": "sha512-ZqhVUAYKKjylbM5Ue8okWNTYZaS5J3hnXhAN0/HcaRoAVCSEH1Ikef61xHvWHqSLQqDgNi+nWuSjbyRuY/b5Kw==",
+      "version": "2.40.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.40.13.tgz",
+      "integrity": "sha512-YfOQu3KOl18HRSQU2lzUgKPrD9PhDYva10os59TA3ZEsEU39aMHWbjQGLHulCBkJN885+MttYwGoSuD/YDWpHA==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.12",
-        "@hpcc-js/common": "^2.71.12"
+        "@hpcc-js/api": "^2.12.13",
+        "@hpcc-js/common": "^2.71.13"
       }
     },
     "node_modules/@hpcc-js/util": {
diff --git a/esp/src/package.json b/esp/src/package.json
index ef77a32ff76..bbecfb3da94 100644
--- a/esp/src/package.json
+++ b/esp/src/package.json
@@ -39,20 +39,20 @@
     "@fluentui/react-experiments": "8.14.95",
     "@fluentui/react-hooks": "8.6.29",
     "@fluentui/react-icons-mdl2": "1.3.47",
-    "@hpcc-js/chart": "2.81.7",
-    "@hpcc-js/codemirror": "2.60.12",
-    "@hpcc-js/common": "2.71.12",
-    "@hpcc-js/comms": "2.84.4",
+    "@hpcc-js/chart": "2.81.8",
+    "@hpcc-js/codemirror": "2.60.13",
+    "@hpcc-js/common": "2.71.13",
+    "@hpcc-js/comms": "2.84.5",
     "@hpcc-js/dataflow": "8.1.6",
-    "@hpcc-js/eclwatch": "2.73.27",
-    "@hpcc-js/graph": "2.85.8",
-    "@hpcc-js/html": "2.42.13",
-    "@hpcc-js/layout": "2.49.12",
-    "@hpcc-js/map": "2.77.11",
-    "@hpcc-js/other": "2.15.12",
-    "@hpcc-js/phosphor": "2.16.12",
-    "@hpcc-js/react": "2.53.9",
-    "@hpcc-js/tree": "2.40.12",
+    "@hpcc-js/eclwatch": "2.73.29",
+    "@hpcc-js/graph": "2.85.9",
+    "@hpcc-js/html": "2.42.14",
+    "@hpcc-js/layout": "2.49.13",
+    "@hpcc-js/map": "2.77.12",
+    "@hpcc-js/other": "2.15.13",
+    "@hpcc-js/phosphor": "2.16.13",
+    "@hpcc-js/react": "2.53.10",
+    "@hpcc-js/tree": "2.40.13",
     "@hpcc-js/util": "2.50.6",
     "@kubernetes/client-node": "0.18.1",
     "clipboard": "2.0.11",
diff --git a/esp/src/src/DataPatterns/PopularPatterns.ts b/esp/src/src/DataPatterns/PopularPatterns.ts
index 872a1807712..d109d69f9c0 100644
--- a/esp/src/src/DataPatterns/PopularPatterns.ts
+++ b/esp/src/src/DataPatterns/PopularPatterns.ts
@@ -1,6 +1,8 @@
 import { BreakdownTable } from "@hpcc-js/html";
 import { config } from "./config";
 
+const maxRowCount = 64;
+
 export class PopularPatterns extends BreakdownTable {
     constructor(rows, showTitle: boolean = true) {
         super();
@@ -25,10 +27,15 @@ export class PopularPatterns extends BreakdownTable {
                 "font-weight": "normal",
                 "text-align": "right"
             }])
-            .data(rows.map(row => [
-                row.data_pattern.trim(),
-                row.rec_count
-            ]))
+            .useCalculatedRowCount(false)
+            .rowCount(6)
+            .data(rows
+                .filter((row, idx) => idx < maxRowCount)
+                .map(row => [
+                    row.data_pattern.trim(),
+                    row.rec_count
+                ])
+            )
             ;
     }
 }