diff --git a/.nvmrc b/.nvmrc
index c519bf5b..e8416a15 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v24.11.0
+v24.13.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4178a681..c336c28c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,62 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [12.3.0](https://github.com/danactive/history/compare/v12.2.0...v12.3.0) (2026-01-31)
+
+
+### Features
+
+* **Admin > Edit Album:** Add Edit count pill ([27ebcf7](https://github.com/danactive/history/commit/27ebcf71addc9cc4c0b7763047df01a1f76d7c8f))
+* **Admin > Edit Album:** Add filename filter before Gallery/Album dropdown ([937a8f2](https://github.com/danactive/history/commit/937a8f2b2f464f13834b1bb13ae69911448c3c60))
+* **Admin > Edit Album:** Add keyword autocomplete ([585ef57](https://github.com/danactive/history/commit/585ef578b22ea972f10939368cbee762d4fbff53))
+* **Admin > Edit Album:** Change layout to vertical thumbs with sticky Fields ([e03fa23](https://github.com/danactive/history/commit/e03fa23096cccff09af76543d1257a9a8689440a))
+* **Admin > Edit Album:** Clipboard for reference ([104c0d7](https://github.com/danactive/history/commit/104c0d77b6d34bf95423f964be09eb7d3b5194f6))
+* **Admin > Edit Album:** Discard empty XML elements ([1ca56d2](https://github.com/danactive/history/commit/1ca56d2dd254e430d517d725f004bf22de2b38d1))
+* **Admin > Edit Album:** Edit multiple photos ([c3f3720](https://github.com/danactive/history/commit/c3f37202bf7b99d71a4a04ff68fb57a45c44c7e3))
+* **Admin > Edit Album:** Generate XML ready for copy and paste ([456fb5e](https://github.com/danactive/history/commit/456fb5e0aafabcb94268da87d8d36e2a089d3f8c))
+* **Admin > Edit Album:** Input lat,long spilt, clipboard, allow degrees minutes format ([b30d189](https://github.com/danactive/history/commit/b30d18902ceee972e5089b8a676774b3494ab9cf))
+* **Admin > Edit Album:** Keyboard arrows next and prev image ([b29b2aa](https://github.com/danactive/history/commit/b29b2aa8cff7b8aad5d44c7eb43c97c54e0d7e56))
+* **Admin > Edit Album:** Persist album data ([9512cee](https://github.com/danactive/history/commit/9512ceec2129b725f8e8ba2b1ac5a73fb5b397c2))
+* **Admin > Edit Album:** Refactor all keyword items ([8bc1696](https://github.com/danactive/history/commit/8bc1696d4cc594ac684fb782f7eb8f9cc141fcde))
+* **Admin > Edit Album:** Yellow border to indicate multiple selected thumbs ([44f04ec](https://github.com/danactive/history/commit/44f04ec0ac6bc8ec15b66672aa1ef9485140952a))
+* **Admin > Rename:** Add test for moving videos to video folder ([df39cb1](https://github.com/danactive/history/commit/df39cb14964968eed3ad3d38f337fce2263aed8c))
+* **Admin > Rename:** When renaming force file type to be lower ([82b2319](https://github.com/danactive/history/commit/82b2319b35b50db1610fdb891ff3c6178fe40c54))
+* **Map > Cluster:** Add labels to clustered ([dee4996](https://github.com/danactive/history/commit/dee499600a5e333d7c30fdbb9dc932113cd34d69))
+* **Map > Cluster:** Change label to City above neighbourhood ([32f830d](https://github.com/danactive/history/commit/32f830d78998cc3721c182856709771540056fe8))
+* **Map > Cluster:** Generate cluster at build time not runtime ([3f6e5ac](https://github.com/danactive/history/commit/3f6e5acbcc56d1d9b26ba197e6bcf494c09c2caa))
+* **Map > Cluster:** Generate cluster labels 50km, 10, 1.5, 500m ([c443a9e](https://github.com/danactive/history/commit/c443a9ec701b860c22bc80d39119b5f65c4c4dad))
+* **Map > Cluster:** Generate cluster labels 50km, 10, 2, 500m ([51c27ea](https://github.com/danactive/history/commit/51c27eaeb1253abc97e4e7005a3c00106008edbc))
+* **package.json:** Upgrade Next.js v16 ([bd69ca9](https://github.com/danactive/history/commit/bd69ca96f3ea874fef00b42091c178c1ce2b0b76))
+* **Slippy Map:** Cache clustering and UI ([813eb48](https://github.com/danactive/history/commit/813eb484c9b0db80383f191c9d81e0b1453d550d))
+* **Slippy Map:** Use H3 for better spatial consistency of marker clusters ([4276d74](https://github.com/danactive/history/commit/4276d7402333a8716422d45a7b8bb02355643148))
+* **useSearch:** Allow complex search expression ([eaa3115](https://github.com/danactive/history/commit/eaa3115c8b6f1a9a34d8f3864926ef0f9bb5276a))
+* **View Album > useSearch:** Add Bookmark button ([75a2bf2](https://github.com/danactive/history/commit/75a2bf2c326dd3993f5dc53637dbd748c8efd6ce))
+* **View Album > useSearch:** Add Expand button ([e64099f](https://github.com/danactive/history/commit/e64099f30053b1c5c964374498a9afe18e39380f))
+* **View Album > useSearch:** Rename Expand button to Clear ([e9ebfa8](https://github.com/danactive/history/commit/e9ebfa8978ddcf18c5e0272e87b4ccfc9cfb5414))
+
+
+### Bug Fixes
+
+* **Admin > Edit Album:** Fix the XML order ([161986f](https://github.com/danactive/history/commit/161986f0df27558d83a60261795d4a314a698aa2))
+* **Admin > Rename:** Add another unit test for HEIC pairs ([12280fa](https://github.com/danactive/history/commit/12280fa84fca67a7d275a972d8a257fde11089d4))
+* **Admin > Rename:** Add test for lowercase names ([3522e95](https://github.com/danactive/history/commit/3522e959f1da39d5c92efa8c6d616bad535be29e))
+* **Admin > Rename:** Check if the destination directories ([9680f6d](https://github.com/danactive/history/commit/9680f6d5c7d8c002c252fcfd7ecc87a703dcc07c))
+* **Admin > Rename:** Return skipped count if case filename collision found ([cacdb99](https://github.com/danactive/history/commit/cacdb9992714f988bf1526fe1f67465fdb1903fe))
+* **Admin > Walk:** HEIF as ext is included with heif ([37cd62c](https://github.com/danactive/history/commit/37cd62ccc1c0591ba8e22e544b8ab5685981a9a2))
+* **All:** Restore description to appear in photo gallery ([8ea2d23](https://github.com/danactive/history/commit/8ea2d230fe80bd109534cf033ae92a9b4b002430))
+* **npm run build:** Remove Node.js from client component ([8295287](https://github.com/danactive/history/commit/8295287e2d6dfd5ca403d57fdc6e2e7636a35f09))
+* **package:** Conform to Turbopack breaking changes ([185f6cf](https://github.com/danactive/history/commit/185f6cf78b45c10ce01d09463a54fcd127e142ed))
+* **package:** Enable React compiler ([7c65161](https://github.com/danactive/history/commit/7c65161f0c4725534cc11bd234002d03371c060e))
+* **package:** More Next.js issues to resolve ([a58973c](https://github.com/danactive/history/commit/a58973c19d8e022ccbc00d2af67ab635826d80a1))
+* **Page > All:** Decrease server JSON by 4MB ([d932593](https://github.com/danactive/history/commit/d932593340ab31c3d4f97b6b12eaa98a26832f10))
+* **Slippy Map:** Tweak CSS ([0e2fa64](https://github.com/danactive/history/commit/0e2fa649f3f1bd4451b3272d80a068e15d7b37cd))
+* **useSearch:** Avoid circular dependency ([02e70b1](https://github.com/danactive/history/commit/02e70b162f7396e7052a62ed9e7ab68431359597))
+* **useSearch:** Clean button is improved right of Filter btn ([6aa4dac](https://github.com/danactive/history/commit/6aa4dacd54039af3322d0673950c4cb9c7d2a2c0))
+* **useSearch:** Clear button clears the input value too ([4a9c0c1](https://github.com/danactive/history/commit/4a9c0c1c9e651e92230fd76a4e0902b5828245e6))
+* **useSearch:** Prevent case naming collision ([249ccd7](https://github.com/danactive/history/commit/249ccd72553c5327f9cb625904421ccfe57ef1c7))
+* **UseSearch:** URL filtered galleries display the filter count ([dcd31be](https://github.com/danactive/history/commit/dcd31be63f18a5552523b8e46ac70f07bab6a451))
+* **useSearch:** URL initials keywords put value in input too ([8cec71d](https://github.com/danactive/history/commit/8cec71df6af965ccc444114a8e162774c7e02467))
+
 ## [12.2.0](https://github.com/danactive/history/compare/v12.1.0...v12.2.0) (2025-11-23)
 
 
diff --git a/app/api/admin/keywords/route.ts b/app/api/admin/keywords/route.ts
new file mode 100644
index 00000000..be33fe66
--- /dev/null
+++ b/app/api/admin/keywords/route.ts
@@ -0,0 +1,13 @@
+import { NextResponse } from 'next/server'
+
+import { getAllKeywords } from '../../../../src/lib/get-all-items'
+
+export async function GET() {
+  try {
+    const { indexedKeywords } = await getAllKeywords()
+    return NextResponse.json({ keywords: indexedKeywords })
+  } catch (error) {
+    console.error('Failed to get keywords:', error)
+    return NextResponse.json({ error: 'Failed to get keywords' }, { status: 500 })
+  }
+}
diff --git a/app/api/admin/search/route.ts b/app/api/admin/search/route.ts
new file mode 100644
index 00000000..db2e58d5
--- /dev/null
+++ b/app/api/admin/search/route.ts
@@ -0,0 +1,65 @@
+import { NextRequest, NextResponse } from 'next/server'
+
+import getAlbums from '../../../../src/lib/albums'
+import { rawParseOptions, readAlbum } from '../../../../src/lib/xml'
+import type { AlbumMeta, Gallery, Item, RawXmlAlbum, RawXmlItem } from '../../../../src/types/common.d'
+
+export type SearchResult = {
+  gallery: Gallery;
+  album: AlbumMeta['albumName'];
+  filename: Item['filename'];
+  index: number;
+}
+
+export async function GET(request: NextRequest) {
+  const { searchParams } = new URL(request.url)
+  const query = searchParams.get('query')
+
+  if (!query) {
+    return NextResponse.json({ error: 'Query parameter is required' }, { status: 400 })
+  }
+
+  try {
+    // Get all galleries and albums
+    const galleryAlbum = await getAlbums()
+    const results: SearchResult[] = []
+
+    // Search through all galleries and albums
+    for (const gallery of Object.keys(galleryAlbum) as Gallery[]) {
+      const albums = galleryAlbum[gallery].albums
+
+      for (const album of albums) {
+        try {
+          // Read the album XML
+          const xmlAlbum: RawXmlAlbum = await readAlbum(gallery, album.name, rawParseOptions)
+          const items = xmlAlbum?.album?.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
+
+          // Search through items for matching filenames
+          items.forEach((item: RawXmlItem, index: number) => {
+            const filenames = Array.isArray(item.filename) ? item.filename : [item.filename]
+            const hasMatch = filenames.some((filename: string) =>
+              filename.toLowerCase().includes(query.toLowerCase()),
+            )
+
+            if (hasMatch) {
+              results.push({
+                gallery,
+                album: album.name,
+                filename: Array.isArray(item.filename) ? item.filename[0] : item.filename,
+                index,
+              })
+            }
+          })
+        } catch (error) {
+          // Skip albums that can't be read
+          console.error(`Error reading album ${gallery}/${album.name}:`, error)
+        }
+      }
+    }
+
+    return NextResponse.json({ results })
+  } catch (error) {
+    console.error('Search error:', error)
+    return NextResponse.json({ error: 'Search failed' }, { status: 500 })
+  }
+}
diff --git a/app/api/admin/xml/[gallery]/[album]/route.ts b/app/api/admin/xml/[gallery]/[album]/route.ts
new file mode 100644
index 00000000..a9e75eaf
--- /dev/null
+++ b/app/api/admin/xml/[gallery]/[album]/route.ts
@@ -0,0 +1,20 @@
+import { NextRequest, NextResponse } from 'next/server'
+
+import { rawParseOptions, readAlbum } from '../../../../../../src/lib/xml'
+import type { Gallery, RawXmlAlbum } from '../../../../../../src/types/common'
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Promise<{ gallery: string, album: string }> },
+) {
+  const { gallery, album } = await params
+
+  try {
+    // Use existing readAlbum with raw parse options (no camelCase transformation)
+    const xmlAlbum: RawXmlAlbum = await readAlbum(gallery as Gallery, album, rawParseOptions)
+
+    return NextResponse.json(xmlAlbum)
+  } catch (error) {
+    return NextResponse.json({ error: 'Failed to load XML' }, { status: 500 })
+  }
+}
diff --git a/app/global.css b/app/global.css
index 5a20ea81..539de7ea 100644
--- a/app/global.css
+++ b/app/global.css
@@ -11,3 +11,7 @@ html {
   --gridPx: 4px;
   --grid2Px: calc(2 * 4px);
 }
+
+.mapboxgl-control-container {
+  display: none;
+}
diff --git a/package-lock.json b/package-lock.json
index 8e520460..652c43cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "history-app",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "history-app",
-      "version": "12.2.0",
+      "version": "12.3.0",
       "license": "MIT",
       "dependencies": {
         "@emotion/react": "^11.14.0",
@@ -16,51 +16,51 @@
         "babel-plugin-react-compiler": "^1.0.0",
         "camelcase": "^6.3.0",
         "color-thief-react": "^2.1.0",
-        "glob": "^13.0.0",
+        "glob": "^13.0.1",
         "h3-js": "^4.4.0",
         "heic-convert": "^2.1.0",
-        "mapbox-gl": "^3.17.0",
+        "mapbox-gl": "^3.18.1",
         "mime-types": "^3.0.2",
-        "next": "16.1.1",
-        "react": "19.2.3",
-        "react-dom": "19.2.3",
+        "next": "^16.1.6",
+        "react": "19.2.4",
+        "react-dom": "19.2.4",
         "react-image-gallery": "^1.4.0",
         "react-map-gl": "^8.1.0",
         "sharp": "^0.34.5",
         "stylis": "^4.3.6",
-        "swr": "^2.3.8",
+        "swr": "^2.4.0",
         "xml2js": "^0.6.2",
-        "zod": "^4.3.4"
+        "zod": "^4.3.6"
       },
       "devDependencies": {
         "@eslint/js": "^9.28.0",
-        "@next/eslint-plugin-next": "16.1.1",
-        "@playwright/test": "^1.57.0",
+        "@next/eslint-plugin-next": "^16.1.1",
+        "@playwright/test": "^1.58.1",
         "@testing-library/jest-dom": "^6.9.1",
-        "@testing-library/react": "^16.3.1",
+        "@testing-library/react": "^16.3.2",
         "@types/boom": "^7.3.5",
         "@types/geojson": "^7946.0.16",
         "@types/heic-convert": "^2.1.0",
         "@types/jest": "^30.0.0",
         "@types/mime-types": "^3.0.1",
-        "@types/node": "^24.10.4",
-        "@types/react": "19.2.7",
+        "@types/node": "^24.10.10",
+        "@types/react": "19.2.10",
         "@types/react-dom": "19.2.3",
         "@types/react-image-gallery": "^1.2.4",
         "@types/xml2js": "^0.4.14",
         "@typescript-eslint/eslint-plugin": "^8.48.1",
         "@typescript-eslint/parser": "^8.48.1",
         "eslint": "^9.39.2",
-        "eslint-config-next": "16.1.1",
+        "eslint-config-next": "^16.1.6",
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-jest-dom": "^5.5.0",
-        "eslint-plugin-jsdoc": "^61.5.0",
+        "eslint-plugin-jsdoc": "^61.7.1",
         "eslint-plugin-jsx-a11y": "^6.10.2",
         "eslint-plugin-testing-library": "^7.15.4",
         "jest": "^30.2.0",
         "jest-environment-jsdom": "^30.2.0",
         "next-test-api-route-handler": "^5.0.3",
-        "snyk": "^1.1301.2",
+        "snyk": "^1.1302.1",
         "standard-version": "^9.5.0",
         "ts-jest": "^29.4.6",
         "tsx": "^4.21.0",
@@ -104,12 +104,12 @@
       "license": "ISC"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -118,9 +118,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
-      "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
+      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -128,21 +128,22 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
-      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
+      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-module-transforms": "^7.28.3",
-        "@babel/helpers": "^7.28.4",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.28.5",
-        "@babel/types": "^7.28.5",
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helpers": "^7.28.6",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -176,13 +177,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
-      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.0.tgz",
+      "integrity": "sha512-vSH118/wwM/pLR38g/Sgk05sNtro6TlTJKuiMXDaZqPUfjTFcudpCOt00IhOfj+1BFAX+UFAlzCU+6WXr3GLFQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -192,13 +193,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.2",
+        "@babel/compat-data": "^7.28.6",
         "@babel/helper-validator-option": "^7.27.1",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
@@ -228,28 +229,28 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
-      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
+      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.28.3"
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -259,9 +260,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
-      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
+      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -297,26 +298,26 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
-      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
+      "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.4"
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
+      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.5"
+        "@babel/types": "^7.29.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -381,13 +382,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
-      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz",
+      "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -423,13 +424,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
-      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
+      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -549,13 +550,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
-      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz",
+      "integrity": "sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -565,40 +566,40 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
-      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
+      "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+        "@babel/code-frame": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
-      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
+      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.29.0",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -606,9 +607,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -713,6 +714,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -736,14 +738,15 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@emnapi/core": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.1.tgz",
-      "integrity": "sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
+      "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -761,9 +764,9 @@
       "optional": true
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz",
-      "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz",
+      "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -866,6 +869,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
       "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -909,6 +913,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
       "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -976,17 +981,17 @@
       "license": "0BSD"
     },
     "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.76.0",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.76.0.tgz",
-      "integrity": "sha512-g+RihtzFgGTx2WYCuTHbdOXJeAlGnROws0TeALx9ow/ZmOROOZkVg5wp/B44n0WJgI4SQFP1eWM2iRPlU2Y14w==",
+      "version": "0.78.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.78.0.tgz",
+      "integrity": "sha512-rQkU5u8hNAq2NVRzHnIUUvR6arbO0b6AOlvpTNS48CkiKSn/xtNfOzBK23JE4SiW89DgvU7GtxLVgV4Vn2HBAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.8",
-        "@typescript-eslint/types": "^8.46.0",
+        "@typescript-eslint/types": "^8.46.4",
         "comment-parser": "1.4.1",
         "esquery": "^1.6.0",
-        "jsdoc-type-pratt-parser": "~6.10.0"
+        "jsdoc-type-pratt-parser": "~7.0.0"
       },
       "engines": {
         "node": ">=20.11.0"
@@ -1641,31 +1646,31 @@
       "license": "MIT"
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
-      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.4.tgz",
+      "integrity": "sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/utils": "^0.2.10"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
-      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.5.tgz",
+      "integrity": "sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.7.3",
+        "@floating-ui/core": "^1.7.4",
         "@floating-ui/utils": "^0.2.10"
       }
     },
     "node_modules/@floating-ui/react-dom": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.6.tgz",
-      "integrity": "sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.7.tgz",
+      "integrity": "sha512-0tLRojf/1Go2JgEVm+3Frg9A3IW8bJgKgdO0BN5RkF//ufuz2joZM63Npau2ff3J6lUVYgDSNzNkR+aH3IVfjg==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/dom": "^1.7.4"
+        "@floating-ui/dom": "^1.7.5"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -2232,9 +2237,9 @@
       }
     },
     "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz",
+      "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==",
       "license": "MIT",
       "dependencies": {
         "@isaacs/balanced-match": "^4.0.1"
@@ -2760,6 +2765,7 @@
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
       "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -3289,15 +3295,15 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.1.tgz",
-      "integrity": "sha512-3oxyM97Sr2PqiVyMyrZUtrtM3jqqFxOQJVuKclDsgj/L728iZt/GyslkN4NwarledZATCenbk4Offjk1hQmaAA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.6.tgz",
+      "integrity": "sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==",
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-16.1.1.tgz",
-      "integrity": "sha512-Ovb/6TuLKbE1UiPcg0p39Ke3puyTCIKN9hGbNItmpQsp+WX3qrjO3WaMVSi6JHr9X1NrmthqIguVHodMJbh/dw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-16.1.6.tgz",
+      "integrity": "sha512-/Qq3PTagA6+nYVfryAtQ7/9FEr/6YVyvOtl6rZnGsbReGLf0jZU6gkpr1FuChAQpvV46a78p4cmHOVP8mbfSMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3305,9 +3311,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.1.tgz",
-      "integrity": "sha512-JS3m42ifsVSJjSTzh27nW+Igfha3NdBOFScr9C80hHGrWx55pTrVL23RJbqir7k7/15SKlrLHhh/MQzqBBYrQA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.6.tgz",
+      "integrity": "sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==",
       "cpu": [
         "arm64"
       ],
@@ -3321,9 +3327,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.1.tgz",
-      "integrity": "sha512-hbyKtrDGUkgkyQi1m1IyD3q4I/3m9ngr+V93z4oKHrPcmxwNL5iMWORvLSGAf2YujL+6HxgVvZuCYZfLfb4bGw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.6.tgz",
+      "integrity": "sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==",
       "cpu": [
         "x64"
       ],
@@ -3337,9 +3343,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.1.tgz",
-      "integrity": "sha512-/fvHet+EYckFvRLQ0jPHJCUI5/B56+2DpI1xDSvi80r/3Ez+Eaa2Yq4tJcRTaB1kqj/HrYKn8Yplm9bNoMJpwQ==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.6.tgz",
+      "integrity": "sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==",
       "cpu": [
         "arm64"
       ],
@@ -3353,9 +3359,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.1.tgz",
-      "integrity": "sha512-MFHrgL4TXNQbBPzkKKur4Fb5ICEJa87HM7fczFs2+HWblM7mMLdco3dvyTI+QmLBU9xgns/EeeINSZD6Ar+oLg==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.6.tgz",
+      "integrity": "sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==",
       "cpu": [
         "arm64"
       ],
@@ -3369,9 +3375,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.1.tgz",
-      "integrity": "sha512-20bYDfgOQAPUkkKBnyP9PTuHiJGM7HzNBbuqmD0jiFVZ0aOldz+VnJhbxzjcSabYsnNjMPsE0cyzEudpYxsrUQ==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.6.tgz",
+      "integrity": "sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==",
       "cpu": [
         "x64"
       ],
@@ -3385,9 +3391,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.1.tgz",
-      "integrity": "sha512-9pRbK3M4asAHQRkwaXwu601oPZHghuSC8IXNENgbBSyImHv/zY4K5udBusgdHkvJ/Tcr96jJwQYOll0qU8+fPA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.6.tgz",
+      "integrity": "sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==",
       "cpu": [
         "x64"
       ],
@@ -3401,9 +3407,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.1.tgz",
-      "integrity": "sha512-bdfQkggaLgnmYrFkSQfsHfOhk/mCYmjnrbRCGgkMcoOBZ4n+TRRSLmT/CU5SATzlBJ9TpioUyBW/vWFXTqQRiA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.6.tgz",
+      "integrity": "sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==",
       "cpu": [
         "arm64"
       ],
@@ -3417,9 +3423,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.1.tgz",
-      "integrity": "sha512-Ncwbw2WJ57Al5OX0k4chM68DKhEPlrXBaSXDCi2kPi5f4d8b3ejr3RRJGfKBLrn2YJL5ezNS7w2TZLHSti8CMw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.6.tgz",
+      "integrity": "sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==",
       "cpu": [
         "x64"
       ],
@@ -3505,13 +3511,14 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.57.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz",
-      "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
+      "version": "1.58.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.1.tgz",
+      "integrity": "sha512-6LdVIUERWxQMmUSSQi0I53GgCBYgM2RpGngCPY7hSeju+VrKjq3lvs7HpJoPbDiY5QM5EYRtRX5fvrinnMAz3w==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
-        "playwright": "1.57.0"
+        "playwright": "1.58.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -3531,9 +3538,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.54.0.tgz",
-      "integrity": "sha512-OywsdRHrFvCdvsewAInDKCNyR3laPA2mc9bRYJ6LBp5IyvF3fvXbbNR0bSzHlZVFtn6E0xw2oZlyjg4rKCVcng==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz",
+      "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==",
       "cpu": [
         "arm"
       ],
@@ -3545,9 +3552,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.54.0.tgz",
-      "integrity": "sha512-Skx39Uv+u7H224Af+bDgNinitlmHyQX1K/atIA32JP3JQw6hVODX5tkbi2zof/E69M1qH2UoN3Xdxgs90mmNYw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz",
+      "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==",
       "cpu": [
         "arm64"
       ],
@@ -3559,9 +3566,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.54.0.tgz",
-      "integrity": "sha512-k43D4qta/+6Fq+nCDhhv9yP2HdeKeP56QrUUTW7E6PhZP1US6NDqpJj4MY0jBHlJivVJD5P8NxrjuobZBJTCRw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz",
+      "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==",
       "cpu": [
         "arm64"
       ],
@@ -3573,9 +3580,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.54.0.tgz",
-      "integrity": "sha512-cOo7biqwkpawslEfox5Vs8/qj83M/aZCSSNIWpVzfU2CYHa2G3P1UN5WF01RdTHSgCkri7XOlTdtk17BezlV3A==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz",
+      "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==",
       "cpu": [
         "x64"
       ],
@@ -3587,9 +3594,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.54.0.tgz",
-      "integrity": "sha512-miSvuFkmvFbgJ1BevMa4CPCFt5MPGw094knM64W9I0giUIMMmRYcGW/JWZDriaw/k1kOBtsWh1z6nIFV1vPNtA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz",
+      "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==",
       "cpu": [
         "arm64"
       ],
@@ -3601,9 +3608,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.54.0.tgz",
-      "integrity": "sha512-KGXIs55+b/ZfZsq9aR026tmr/+7tq6VG6MsnrvF4H8VhwflTIuYh+LFUlIsRdQSgrgmtM3fVATzEAj4hBQlaqQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz",
+      "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==",
       "cpu": [
         "x64"
       ],
@@ -3615,9 +3622,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.54.0.tgz",
-      "integrity": "sha512-EHMUcDwhtdRGlXZsGSIuXSYwD5kOT9NVnx9sqzYiwAc91wfYOE1g1djOEDseZJKKqtHAHGwnGPQu3kytmfaXLQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz",
+      "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==",
       "cpu": [
         "arm"
       ],
@@ -3629,9 +3636,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.54.0.tgz",
-      "integrity": "sha512-+pBrqEjaakN2ySv5RVrj/qLytYhPKEUwk+e3SFU5jTLHIcAtqh2rLrd/OkbNuHJpsBgxsD8ccJt5ga/SeG0JmA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz",
+      "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==",
       "cpu": [
         "arm"
       ],
@@ -3643,9 +3650,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.54.0.tgz",
-      "integrity": "sha512-NSqc7rE9wuUaRBsBp5ckQ5CVz5aIRKCwsoa6WMF7G01sX3/qHUw/z4pv+D+ahL1EIKy6Enpcnz1RY8pf7bjwng==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz",
+      "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==",
       "cpu": [
         "arm64"
       ],
@@ -3657,9 +3664,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.54.0.tgz",
-      "integrity": "sha512-gr5vDbg3Bakga5kbdpqx81m2n9IX8M6gIMlQQIXiLTNeQW6CucvuInJ91EuCJ/JYvc+rcLLsDFcfAD1K7fMofg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz",
+      "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==",
       "cpu": [
         "arm64"
       ],
@@ -3671,9 +3678,23 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.54.0.tgz",
-      "integrity": "sha512-gsrtB1NA3ZYj2vq0Rzkylo9ylCtW/PhpLEivlgWe0bpgtX5+9j9EZa0wtZiCjgu6zmSeZWyI/e2YRX1URozpIw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz",
+      "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz",
+      "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==",
       "cpu": [
         "loong64"
       ],
@@ -3685,9 +3706,23 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.54.0.tgz",
-      "integrity": "sha512-y3qNOfTBStmFNq+t4s7Tmc9hW2ENtPg8FeUD/VShI7rKxNW7O4fFeaYbMsd3tpFlIg1Q8IapFgy7Q9i2BqeBvA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz",
+      "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz",
+      "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==",
       "cpu": [
         "ppc64"
       ],
@@ -3699,9 +3734,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.54.0.tgz",
-      "integrity": "sha512-89sepv7h2lIVPsFma8iwmccN7Yjjtgz0Rj/Ou6fEqg3HDhpCa+Et+YSufy27i6b0Wav69Qv4WBNl3Rs6pwhebQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz",
+      "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==",
       "cpu": [
         "riscv64"
       ],
@@ -3713,9 +3748,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.54.0.tgz",
-      "integrity": "sha512-ZcU77ieh0M2Q8Ur7D5X7KvK+UxbXeDHwiOt/CPSBTI1fBmeDMivW0dPkdqkT4rOgDjrDDBUed9x4EgraIKoR2A==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz",
+      "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==",
       "cpu": [
         "riscv64"
       ],
@@ -3727,9 +3762,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.54.0.tgz",
-      "integrity": "sha512-2AdWy5RdDF5+4YfG/YesGDDtbyJlC9LHmL6rZw6FurBJ5n4vFGupsOBGfwMRjBYH7qRQowT8D/U4LoSvVwOhSQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz",
+      "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==",
       "cpu": [
         "s390x"
       ],
@@ -3741,9 +3776,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.54.0.tgz",
-      "integrity": "sha512-WGt5J8Ij/rvyqpFexxk3ffKqqbLf9AqrTBbWDk7ApGUzaIs6V+s2s84kAxklFwmMF/vBNGrVdYgbblCOFFezMQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz",
+      "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==",
       "cpu": [
         "x64"
       ],
@@ -3755,9 +3790,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.54.0.tgz",
-      "integrity": "sha512-JzQmb38ATzHjxlPHuTH6tE7ojnMKM2kYNzt44LO/jJi8BpceEC8QuXYA908n8r3CNuG/B3BV8VR3Hi1rYtmPiw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz",
+      "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==",
       "cpu": [
         "x64"
       ],
@@ -3768,10 +3803,24 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz",
+      "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.54.0.tgz",
-      "integrity": "sha512-huT3fd0iC7jigGh7n3q/+lfPcXxBi+om/Rs3yiFxjvSxbSB6aohDFXbWvlspaqjeOh+hx7DDHS+5Es5qRkWkZg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz",
+      "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==",
       "cpu": [
         "arm64"
       ],
@@ -3783,9 +3832,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.54.0.tgz",
-      "integrity": "sha512-c2V0W1bsKIKfbLMBu/WGBz6Yci8nJ/ZJdheE0EwB73N3MvHYKiKGs3mVilX4Gs70eGeDaMqEob25Tw2Gb9Nqyw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz",
+      "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==",
       "cpu": [
         "arm64"
       ],
@@ -3797,9 +3846,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.54.0.tgz",
-      "integrity": "sha512-woEHgqQqDCkAzrDhvDipnSirm5vxUXtSKDYTVpZG3nUdW/VVB5VdCYA2iReSj/u3yCZzXID4kuKG7OynPnB3WQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz",
+      "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==",
       "cpu": [
         "ia32"
       ],
@@ -3811,9 +3860,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.54.0.tgz",
-      "integrity": "sha512-dzAc53LOuFvHwbCEOS0rPbXp6SIhAf2txMP5p6mGyOXXw5mWY8NGGbPMPrs4P1WItkfApDathBj/NzMLUZ9rtQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz",
+      "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==",
       "cpu": [
         "x64"
       ],
@@ -3825,9 +3874,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.54.0.tgz",
-      "integrity": "sha512-hYT5d3YNdSh3mbCU1gwQyPgQd3T2ne0A3KG8KSBdav5TiBg6eInVmV+TeR5uHufiIgSFg0XsOWGW5/RhNcSvPg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz",
+      "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==",
       "cpu": [
         "x64"
       ],
@@ -3931,9 +3980,9 @@
       }
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.34.46",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.46.tgz",
-      "integrity": "sha512-kiW7CtS/NkdvTUjkjUJo7d5JsFfbJ14YjdhDk9KoEgK6nFjKNXZPrX0jfLA8ZlET4cFLHxOZ/0vFKOP+bOxIOQ==",
+      "version": "0.34.48",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
+      "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4033,9 +4082,9 @@
       "license": "MIT"
     },
     "node_modules/@testing-library/react": {
-      "version": "16.3.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.1.tgz",
-      "integrity": "sha512-gr4KtAWqIOQoucWYD/f6ki+j5chXfcPc74Col/6poTyqTmn7zRmodWahWRCp8tYd+GMqBonw6hstNzqjbs6gjw==",
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
+      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4083,8 +4132,7 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -4305,9 +4353,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.4.tgz",
-      "integrity": "sha512-vnDVpYPMzs4wunl27jHrfmwojOGKya0xyM3sH+UE5iv5uPS6vX7UIoh6m+vQc5LGBq52HBKPIn/zcSZVzeDEZg==",
+      "version": "24.10.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.10.tgz",
+      "integrity": "sha512-+0/4J266CBGPUq/ELg7QUHhN25WYjE0wYTPSQJn1xeu8DOlIOPxXxrNGiLmfAWl7HMMgWFWXpt9IDjMWrF5Iow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4340,11 +4388,12 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "19.2.7",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
-      "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
+      "version": "19.2.10",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.10.tgz",
+      "integrity": "sha512-WPigyYuGhgZ/cTPRXB2EwUw+XvsRA3GqHlsP4qteqrnnjDrApbS7MxcGr/hke5iUoeB7E/gQtrs9I37zAJ0Vjw==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -4355,6 +4404,7 @@
       "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "@types/react": "^19.2.0"
       }
@@ -4426,20 +4476,20 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.51.0.tgz",
-      "integrity": "sha512-XtssGWJvypyM2ytBnSnKtHYOGT+4ZwTnBVl36TA4nRO2f4PRNGz5/1OszHzcZCvcBMh+qb7I06uoCmLTRdR9og==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.54.0.tgz",
+      "integrity": "sha512-hAAP5io/7csFStuOmR782YmTthKBJ9ND3WVL60hcOjvtGFb+HJxH4O5huAcmcZ9v9G8P+JETiZ/G1B8MALnWZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.51.0",
-        "@typescript-eslint/type-utils": "8.51.0",
-        "@typescript-eslint/utils": "8.51.0",
-        "@typescript-eslint/visitor-keys": "8.51.0",
-        "ignore": "^7.0.0",
+        "@eslint-community/regexpp": "^4.12.2",
+        "@typescript-eslint/scope-manager": "8.54.0",
+        "@typescript-eslint/type-utils": "8.54.0",
+        "@typescript-eslint/utils": "8.54.0",
+        "@typescript-eslint/visitor-keys": "8.54.0",
+        "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.2.0"
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4449,23 +4499,24 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.51.0",
+        "@typescript-eslint/parser": "^8.54.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.51.0.tgz",
-      "integrity": "sha512-3xP4XzzDNQOIqBMWogftkwxhg5oMKApqY0BAflmLZiFYHqyhSOxv/cd/zPQLTcCXr4AkaKb25joocY0BD1WC6A==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.54.0.tgz",
+      "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.51.0",
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/typescript-estree": "8.51.0",
-        "@typescript-eslint/visitor-keys": "8.51.0",
-        "debug": "^4.3.4"
+        "@typescript-eslint/scope-manager": "8.54.0",
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/typescript-estree": "8.54.0",
+        "@typescript-eslint/visitor-keys": "8.54.0",
+        "debug": "^4.4.3"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4480,15 +4531,15 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.51.0.tgz",
-      "integrity": "sha512-Luv/GafO07Z7HpiI7qeEW5NW8HUtZI/fo/kE0YbtQEFpJRUuR0ajcWfCE5bnMvL7QQFrmT/odMe8QZww8X2nfQ==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.54.0.tgz",
+      "integrity": "sha512-YPf+rvJ1s7MyiWM4uTRhE4DvBXrEV+d8oC3P9Y2eT7S+HBS0clybdMIPnhiATi9vZOYDc7OQ1L/i6ga6NFYK/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.51.0",
-        "@typescript-eslint/types": "^8.51.0",
-        "debug": "^4.3.4"
+        "@typescript-eslint/tsconfig-utils": "^8.54.0",
+        "@typescript-eslint/types": "^8.54.0",
+        "debug": "^4.4.3"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4502,14 +4553,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.51.0.tgz",
-      "integrity": "sha512-JhhJDVwsSx4hiOEQPeajGhCWgBMBwVkxC/Pet53EpBVs7zHHtayKefw1jtPaNRXpI9RA2uocdmpdfE7T+NrizA==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.54.0.tgz",
+      "integrity": "sha512-27rYVQku26j/PbHYcVfRPonmOlVI6gihHtXFbTdB5sb6qA0wdAQAbyXFVarQ5t4HRojIz64IV90YtsjQSSGlQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/visitor-keys": "8.51.0"
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/visitor-keys": "8.54.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4520,9 +4571,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.51.0.tgz",
-      "integrity": "sha512-Qi5bSy/vuHeWyir2C8u/uqGMIlIDu8fuiYWv48ZGlZ/k+PRPHtaAu7erpc7p5bzw2WNNSniuxoMSO4Ar6V9OXw==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.54.0.tgz",
+      "integrity": "sha512-dRgOyT2hPk/JwxNMZDsIXDgyl9axdJI3ogZ2XWhBPsnZUv+hPesa5iuhdYt2gzwA9t8RE5ytOJ6xB0moV0Ujvw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4537,17 +4588,17 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.51.0.tgz",
-      "integrity": "sha512-0XVtYzxnobc9K0VU7wRWg1yiUrw4oQzexCG2V2IDxxCxhqBMSMbjB+6o91A+Uc0GWtgjCa3Y8bi7hwI0Tu4n5Q==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.54.0.tgz",
+      "integrity": "sha512-hiLguxJWHjjwL6xMBwD903ciAwd7DmK30Y9Axs/etOkftC3ZNN9K44IuRD/EB08amu+Zw6W37x9RecLkOo3pMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/typescript-estree": "8.51.0",
-        "@typescript-eslint/utils": "8.51.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.2.0"
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/typescript-estree": "8.54.0",
+        "@typescript-eslint/utils": "8.54.0",
+        "debug": "^4.4.3",
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4562,9 +4613,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.51.0.tgz",
-      "integrity": "sha512-TizAvWYFM6sSscmEakjY3sPqGwxZRSywSsPEiuZF6d5GmGD9Gvlsv0f6N8FvAAA0CD06l3rIcWNbsN1e5F/9Ag==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.54.0.tgz",
+      "integrity": "sha512-PDUI9R1BVjqu7AUDsRBbKMtwmjWcn4J3le+5LpcFgWULN3LvHC5rkc9gCVxbrsrGmO1jfPybN5s6h4Jy+OnkAA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4576,21 +4627,21 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.51.0.tgz",
-      "integrity": "sha512-1qNjGqFRmlq0VW5iVlcyHBbCjPB7y6SxpBkrbhNWMy/65ZoncXCEPJxkRZL8McrseNH6lFhaxCIaX+vBuFnRng==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.54.0.tgz",
+      "integrity": "sha512-BUwcskRaPvTk6fzVWgDPdUndLjB87KYDrN5EYGetnktoeAvPtO4ONHlAZDnj5VFnUANg0Sjm7j4usBlnoVMHwA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.51.0",
-        "@typescript-eslint/tsconfig-utils": "8.51.0",
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/visitor-keys": "8.51.0",
-        "debug": "^4.3.4",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
+        "@typescript-eslint/project-service": "8.54.0",
+        "@typescript-eslint/tsconfig-utils": "8.54.0",
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/visitor-keys": "8.54.0",
+        "debug": "^4.4.3",
+        "minimatch": "^9.0.5",
+        "semver": "^7.7.3",
         "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.2.0"
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4604,16 +4655,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.51.0.tgz",
-      "integrity": "sha512-11rZYxSe0zabiKaCP2QAwRf/dnmgFgvTmeDTtZvUvXG3UuAdg/GU02NExmmIXzz3vLGgMdtrIosI84jITQOxUA==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.54.0.tgz",
+      "integrity": "sha512-9Cnda8GS57AQakvRyG0PTejJNlA2xhvyNtEVIMlDWOOeEyBkYWhGPnfrIAnqxLMTSTo6q8g12XVjjev5l1NvMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.51.0",
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/typescript-estree": "8.51.0"
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.54.0",
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/typescript-estree": "8.54.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4628,13 +4679,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.51.0.tgz",
-      "integrity": "sha512-mM/JRQOzhVN1ykejrvwnBRV3+7yTKK8tVANVN3o1O0t0v7o+jqdVu9crPy5Y9dov15TJk/FTIgoUGHrTOVL3Zg==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.54.0.tgz",
+      "integrity": "sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.51.0",
+        "@typescript-eslint/types": "8.54.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -5093,9 +5144,9 @@
       }
     },
     "node_modules/@whatwg-node/node-fetch": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.8.4.tgz",
-      "integrity": "sha512-AlKLc57loGoyYlrzDbejB9EeR+pfdJdGzbYnkEuZaGekFboBwzfVYVMsy88PMriqPI1ORpiGYGgSSWpx7a2sDA==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.8.5.tgz",
+      "integrity": "sha512-4xzCl/zphPqlp9tASLVeUhB5+WJHbuWGYpfoC2q1qh5dw0AqZBW7L27V5roxYWijPxj4sspRAAoOH3d2ztaHUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5136,9 +5187,9 @@
       "license": "0BSD"
     },
     "node_modules/@whatwg-node/server": {
-      "version": "0.10.17",
-      "resolved": "https://registry.npmjs.org/@whatwg-node/server/-/server-0.10.17.tgz",
-      "integrity": "sha512-QxI+HQfJeI/UscFNCTcSri6nrHP25mtyAMbhEri7W2ctdb3EsorPuJz7IovSgNjvKVs73dg9Fmayewx1O2xOxA==",
+      "version": "0.10.18",
+      "resolved": "https://registry.npmjs.org/@whatwg-node/server/-/server-0.10.18.tgz",
+      "integrity": "sha512-kMwLlxUbduttIgaPdSkmEarFpP+mSY8FEm+QWMBRJwxOHWkri+cxd8KZHO9EMrB9vgUuz+5WEaCawaL5wGVoXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5165,6 +5216,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5574,9 +5626,9 @@
       "license": "MIT"
     },
     "node_modules/axe-core": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.0.tgz",
-      "integrity": "sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.1.tgz",
+      "integrity": "sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==",
       "dev": true,
       "license": "MPL-2.0",
       "engines": {
@@ -5668,6 +5720,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-1.0.0.tgz",
       "integrity": "sha512-Ixm8tFfoKKIPYdCCKYTsqv+Fd4IJ0DQqMyEimo+pxUOMUR9cVPlwTrFt9Avu+3cb6Zp3mAzl+t1MrG2fxxKsxw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/types": "^7.26.0"
       }
@@ -5724,9 +5777,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.9.11",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz",
-      "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==",
+      "version": "2.9.19",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
+      "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.js"
@@ -5792,6 +5845,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -5965,9 +6019,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001762",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001762.tgz",
-      "integrity": "sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==",
+      "version": "1.0.30001767",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001767.tgz",
+      "integrity": "sha512-34+zUAMhSH+r+9eKmYG+k2Rpt8XttfE4yXAjoZvkAPs15xcYQhyBYdalJ65BzivAvGRMViEjy6oKr/S91loekQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -6041,9 +6095,9 @@
       "license": "ISC"
     },
     "node_modules/check-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
-      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz",
+      "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6051,9 +6105,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
-      "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
+      "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
       "dev": true,
       "funding": [
         {
@@ -6067,9 +6121,9 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.1.tgz",
-      "integrity": "sha512-+CmxIZ/L2vNcEfvNtLdU0ZQ6mbq3FZnwAP2PPTiKP+1QOoKwlKlPgb8UKV0Dds7QVaMnHm+FwSft2VB0s/SLjQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz",
+      "integrity": "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -6548,9 +6602,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.47.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.47.0.tgz",
-      "integrity": "sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==",
+      "version": "3.48.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.48.0.tgz",
+      "integrity": "sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -6970,8 +7024,7 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/dot-prop": {
       "version": "5.3.0",
@@ -7129,9 +7182,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.267",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz",
-      "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==",
+      "version": "1.5.286",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
+      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
       "dev": true,
       "license": "ISC"
     },
@@ -7438,6 +7491,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -7493,13 +7547,13 @@
       }
     },
     "node_modules/eslint-config-next": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-16.1.1.tgz",
-      "integrity": "sha512-55nTpVWm3qeuxoQKLOjQVciKZJUphKrNM0fCcQHAIOGl6VFXgaqeMfv0aKJhs7QtcnlAPhNVqsqRfRjeKBPIUA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-16.1.6.tgz",
+      "integrity": "sha512-vKq40io2B0XtkkNDYyleATwblNt8xuh3FWp8SpSz3pt7P01OkBFlKsJZ2mWt5WsCySlDQLckb1zMY9yE9Qy0LA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@next/eslint-plugin-next": "16.1.1",
+        "@next/eslint-plugin-next": "16.1.6",
         "eslint-import-resolver-node": "^0.3.6",
         "eslint-import-resolver-typescript": "^3.5.2",
         "eslint-plugin-import": "^2.32.0",
@@ -7623,6 +7677,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -7721,20 +7776,20 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "61.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-61.5.0.tgz",
-      "integrity": "sha512-PR81eOGq4S7diVnV9xzFSBE4CDENRQGP0Lckkek8AdHtbj+6Bm0cItwlFnxsLFriJHspiE3mpu8U20eODyToIg==",
+      "version": "61.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-61.7.1.tgz",
+      "integrity": "sha512-36DpldF95MlTX//n3/naULFVt8d1cV4jmSkx7ZKrE9ikkKHAgMLesuWp1SmwpVwAs5ndIM6abKd6PeOYZUgdWg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@es-joy/jsdoccomment": "~0.76.0",
+        "@es-joy/jsdoccomment": "~0.78.0",
         "@es-joy/resolve.exports": "1.2.0",
         "are-docs-informative": "^0.0.2",
         "comment-parser": "1.4.1",
         "debug": "^4.4.3",
         "escape-string-regexp": "^4.0.0",
-        "espree": "^10.4.0",
-        "esquery": "^1.6.0",
+        "espree": "^11.0.0",
+        "esquery": "^1.7.0",
         "html-entities": "^2.6.0",
         "object-deep-merge": "^2.0.0",
         "parse-imports-exports": "^0.2.4",
@@ -7749,6 +7804,37 @@
         "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsdoc/node_modules/eslint-visitor-keys": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.0.tgz",
+      "integrity": "sha512-A0XeIi7CXU7nPlfHS9loMYEKxUaONu/hTEzHTGba9Huu94Cq1hPivf+DE5erJozZOky0LfvXAyrV/tcswpLI0Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/espree": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.1.0.tgz",
+      "integrity": "sha512-WFWYhO1fV4iYkqOOvq8FbqIhr2pYfoDY0kCotMkDeNtGpiGGkZ1iov2u8ydjtgM8yF8rzK7oaTbw2NAzbAbehw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.15.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^5.0.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint-plugin-jsx-a11y": {
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
@@ -8777,9 +8863,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.0.tgz",
-      "integrity": "sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==",
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.1.tgz",
+      "integrity": "sha512-EoY1N2xCn44xU6750Sx7OjOIT59FkmstNc3X6y5xpz7D5cBtZRe/3pSlTkDJgqsOk3WwZPkWfonhhUJfttQo3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8885,12 +8971,12 @@
       "license": "MIT"
     },
     "node_modules/glob": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
-      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.1.tgz",
+      "integrity": "sha512-B7U/vJpE3DkJ5WXTgTpTRN63uV42DseiXXKMwG14LQBXmsdeIoHAPbU/MEo6II0k5ED74uc2ZGTC6MwHFQhF6w==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "minimatch": "^10.1.1",
+        "minimatch": "^10.1.2",
         "minipass": "^7.1.2",
         "path-scurry": "^2.0.0"
       },
@@ -8915,12 +9001,12 @@
       }
     },
     "node_modules/glob/node_modules/minimatch": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
-      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.2.tgz",
+      "integrity": "sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "@isaacs/brace-expansion": "^5.0.0"
+        "@isaacs/brace-expansion": "^5.0.1"
       },
       "engines": {
         "node": "20 || >=22"
@@ -10148,6 +10234,7 @@
       "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jest/core": "30.2.0",
         "@jest/types": "30.2.0",
@@ -10353,6 +10440,7 @@
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
       "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -10906,6 +10994,7 @@
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
       "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -11184,9 +11273,9 @@
       "license": "MIT"
     },
     "node_modules/jsdoc-type-pratt-parser": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-6.10.0.tgz",
-      "integrity": "sha512-+LexoTRyYui5iOhJGn13N9ZazL23nAHGkXsa1p/C8yeq79WRfLBag6ZZ0FQG2aRoc9yfo59JT9EYCQonOkHKkQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-7.0.0.tgz",
+      "integrity": "sha512-c7YbokssPOSHmqTbSAmTtnVgAVa/7lumWNYqomgd5KOMyPrRve2anx6lonfOsXEQacqF9FKVUj7bLg4vRSvdYA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11199,6 +11288,7 @@
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -11539,9 +11629,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
       "dev": true,
       "license": "MIT"
     },
@@ -11600,7 +11690,6 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -11662,10 +11751,11 @@
       }
     },
     "node_modules/mapbox-gl": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.17.0.tgz",
-      "integrity": "sha512-nCrDKRlr5di6xUksUDslNWwxroJ5yv1hT8pyVFtcpWJOOKsYQxF/wOFTMie8oxMnXeFkrz1Tl1TwA1XN1yX0KA==",
+      "version": "3.18.1",
+      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.18.1.tgz",
+      "integrity": "sha512-Izc8dee2zkmb6Pn9hXFbVioPRLXJz1OFUcrvri69MhFACPU4bhLyVmhEsD9AyW1qOAP0Yvhzm60v63xdMIHPPw==",
       "license": "SEE LICENSE IN LICENSE.txt",
+      "peer": true,
       "workspaces": [
         "src/style-spec",
         "test/build/vite",
@@ -11692,7 +11782,7 @@
         "gl-matrix": "^3.4.4",
         "grid-index": "^1.1.0",
         "kdbush": "^4.0.2",
-        "martinez-polygon-clipping": "^0.7.4",
+        "martinez-polygon-clipping": "^0.8.1",
         "murmurhash-js": "^1.0.0",
         "pbf": "^4.0.1",
         "potpack": "^2.0.0",
@@ -11702,22 +11792,16 @@
       }
     },
     "node_modules/martinez-polygon-clipping": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/martinez-polygon-clipping/-/martinez-polygon-clipping-0.7.4.tgz",
-      "integrity": "sha512-jBEwrKtA0jTagUZj2bnmb4Yg2s4KnJGRePStgI7bAVjtcipKiF39R4LZ2V/UT61jMYWrTcBhPazexeqd6JAVtw==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/martinez-polygon-clipping/-/martinez-polygon-clipping-0.8.1.tgz",
+      "integrity": "sha512-9PLLMzMPI6ihHox4Ns6LpVBLpRc7sbhULybZ/wyaY8sY3ECNe2+hxm1hA2/9bEEpRrdpjoeduBuZLg2aq1cSIQ==",
       "license": "MIT",
       "dependencies": {
         "robust-predicates": "^2.0.4",
         "splaytree": "^0.1.4",
-        "tinyqueue": "^1.2.0"
+        "tinyqueue": "3.0.0"
       }
     },
-    "node_modules/martinez-polygon-clipping/node_modules/tinyqueue": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-1.2.3.tgz",
-      "integrity": "sha512-Qz9RgWuO9l8lT+Y9xvbzhPT2efIUIFd69N7eF7tJ9lnQl0iLj1M7peK7IoUGZL9DJHw9XftqLreccfxcQgYLxA==",
-      "license": "ISC"
-    },
     "node_modules/matcher": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
@@ -12136,12 +12220,13 @@
       "license": "MIT"
     },
     "node_modules/next": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/next/-/next-16.1.1.tgz",
-      "integrity": "sha512-QI+T7xrxt1pF6SQ/JYFz95ro/mg/1Znk5vBebsWwbpejj1T0A23hO7GYEaVac9QUOT2BIMiuzm0L99ooq7k0/w==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz",
+      "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@next/env": "16.1.1",
+        "@next/env": "16.1.6",
         "@swc/helpers": "0.5.15",
         "baseline-browser-mapping": "^2.8.3",
         "caniuse-lite": "^1.0.30001579",
@@ -12155,14 +12240,14 @@
         "node": ">=20.9.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "16.1.1",
-        "@next/swc-darwin-x64": "16.1.1",
-        "@next/swc-linux-arm64-gnu": "16.1.1",
-        "@next/swc-linux-arm64-musl": "16.1.1",
-        "@next/swc-linux-x64-gnu": "16.1.1",
-        "@next/swc-linux-x64-musl": "16.1.1",
-        "@next/swc-win32-arm64-msvc": "16.1.1",
-        "@next/swc-win32-x64-msvc": "16.1.1",
+        "@next/swc-darwin-arm64": "16.1.6",
+        "@next/swc-darwin-x64": "16.1.6",
+        "@next/swc-linux-arm64-gnu": "16.1.6",
+        "@next/swc-linux-arm64-musl": "16.1.6",
+        "@next/swc-linux-x64-gnu": "16.1.6",
+        "@next/swc-linux-x64-musl": "16.1.6",
+        "@next/swc-win32-arm64-msvc": "16.1.6",
+        "@next/swc-win32-x64-msvc": "16.1.6",
         "sharp": "^0.34.4"
       },
       "peerDependencies": {
@@ -12656,9 +12741,9 @@
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "11.2.4",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
-      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "version": "11.2.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.5.tgz",
+      "integrity": "sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==",
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": "20 || >=22"
@@ -12817,13 +12902,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.57.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
-      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
+      "version": "1.58.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.1.tgz",
+      "integrity": "sha512-+2uTZHxSCcxjvGc5C891LrS1/NlxglGxzrC4seZiVjcYVQfUa87wBL6rTDqzGjuoWNjnBzRqKmF6zRYGMvQUaQ==",
       "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.57.0"
+        "playwright-core": "1.58.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -12836,9 +12921,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.57.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
-      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
+      "version": "1.58.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.1.tgz",
+      "integrity": "sha512-bcWzOaTxcW+VOOGBCQgnaKToLJ65d6AqfLVKEWvexyS3AS6rbXl+xdpYRMGSRBClPvyj44njOWoxjNdL/H9UNg==",
       "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
@@ -12930,7 +13015,6 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -12945,7 +13029,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -12957,8 +13040,7 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
@@ -13099,24 +13181,26 @@
       "license": "MIT"
     },
     "node_modules/react": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
-      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
+      "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
+      "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.3"
+        "react": "^19.2.4"
       }
     },
     "node_modules/react-image-gallery": {
@@ -13129,9 +13213,9 @@
       }
     },
     "node_modules/react-is": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.3.tgz",
-      "integrity": "sha512-qJNJfu81ByyabuG7hPFEbXqNcWSU3+eVus+KJs+0ncpGfMyYdvSmxiJxbWR65lYi1I+/0HBcliO029gc4F+PnA==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.4.tgz",
+      "integrity": "sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA==",
       "license": "MIT"
     },
     "node_modules/react-map-gl": {
@@ -13369,7 +13453,8 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
       "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
@@ -13621,9 +13706,9 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.54.0.tgz",
-      "integrity": "sha512-3nk8Y3a9Ea8szgKhinMlGMhGMw89mqule3KWczxhIzqudyHdCIOHw8WJlj/r329fACjKLEh13ZSk7oE22kyeIw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
+      "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13637,28 +13722,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.54.0",
-        "@rollup/rollup-android-arm64": "4.54.0",
-        "@rollup/rollup-darwin-arm64": "4.54.0",
-        "@rollup/rollup-darwin-x64": "4.54.0",
-        "@rollup/rollup-freebsd-arm64": "4.54.0",
-        "@rollup/rollup-freebsd-x64": "4.54.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.54.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.54.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.54.0",
-        "@rollup/rollup-linux-arm64-musl": "4.54.0",
-        "@rollup/rollup-linux-loong64-gnu": "4.54.0",
-        "@rollup/rollup-linux-ppc64-gnu": "4.54.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.54.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.54.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.54.0",
-        "@rollup/rollup-linux-x64-gnu": "4.54.0",
-        "@rollup/rollup-linux-x64-musl": "4.54.0",
-        "@rollup/rollup-openharmony-arm64": "4.54.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.54.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.54.0",
-        "@rollup/rollup-win32-x64-gnu": "4.54.0",
-        "@rollup/rollup-win32-x64-msvc": "4.54.0",
+        "@rollup/rollup-android-arm-eabi": "4.57.1",
+        "@rollup/rollup-android-arm64": "4.57.1",
+        "@rollup/rollup-darwin-arm64": "4.57.1",
+        "@rollup/rollup-darwin-x64": "4.57.1",
+        "@rollup/rollup-freebsd-arm64": "4.57.1",
+        "@rollup/rollup-freebsd-x64": "4.57.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.57.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.57.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.57.1",
+        "@rollup/rollup-linux-arm64-musl": "4.57.1",
+        "@rollup/rollup-linux-loong64-gnu": "4.57.1",
+        "@rollup/rollup-linux-loong64-musl": "4.57.1",
+        "@rollup/rollup-linux-ppc64-gnu": "4.57.1",
+        "@rollup/rollup-linux-ppc64-musl": "4.57.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.57.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.57.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.57.1",
+        "@rollup/rollup-linux-x64-gnu": "4.57.1",
+        "@rollup/rollup-linux-x64-musl": "4.57.1",
+        "@rollup/rollup-openbsd-x64": "4.57.1",
+        "@rollup/rollup-openharmony-arm64": "4.57.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.57.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.57.1",
+        "@rollup/rollup-win32-x64-gnu": "4.57.1",
+        "@rollup/rollup-win32-x64-msvc": "4.57.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -13781,10 +13869,13 @@
       "license": "MIT"
     },
     "node_modules/sax": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz",
-      "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==",
-      "license": "BlueOak-1.0.0"
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.4.tgz",
+      "integrity": "sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=11.0.0"
+      }
     },
     "node_modules/saxes": {
       "version": "6.0.0",
@@ -14085,9 +14176,9 @@
       }
     },
     "node_modules/snyk": {
-      "version": "1.1301.2",
-      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1301.2.tgz",
-      "integrity": "sha512-FUTV/2WStY0GyvJROvxKPa2A3FzgVNIUB8rR2LMiR1to9onrnyO233HEIOS1HU+dJTXHFSh8z3fMze2TqPt58w==",
+      "version": "1.1302.1",
+      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1302.1.tgz",
+      "integrity": "sha512-RT85Pz4N36xma7Mcob0Jno5TXu22VbVoT+7mWHk2TVkBHqsMZ8sKW55X+r+LMaT8GwlC5+cYjzw2iuv1VcPZOg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -14864,9 +14955,9 @@
       }
     },
     "node_modules/swr": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.8.tgz",
-      "integrity": "sha512-gaCPRVoMq8WGDcWj9p4YWzCMPHzE0WNl6W8ADIx9c3JBEIdMkJGMzW+uzXvxHMltwcYACr9jP+32H8/hgwMR7w==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-2.4.0.tgz",
+      "integrity": "sha512-sUlC20T8EOt1pHmDiqueUWMmRRX03W7w5YxovWX7VR2KHEPCTMly85x05vpkP5i6Bu4h44ePSMD9Tc+G2MItFw==",
       "license": "MIT",
       "dependencies": {
         "dequal": "^2.0.3",
@@ -14884,9 +14975,9 @@
       "license": "MIT"
     },
     "node_modules/synckit": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
-      "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==",
+      "version": "0.11.12",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
+      "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14929,7 +15020,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -15047,6 +15138,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15184,9 +15276,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.3.0.tgz",
-      "integrity": "sha512-6eg3Y9SF7SsAvGzRHQvvc1skDAhwI4YQ32ui1scxD1Ccr0G5qIIbUBT3pFTKX8kmWIQClHobtUdNuaBgwdfdWg==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
+      "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15320,6 +15412,7 @@
       "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "~0.27.0",
         "get-tsconfig": "^4.7.5"
@@ -15479,6 +15572,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -15488,16 +15582,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.51.0.tgz",
-      "integrity": "sha512-jh8ZuM5oEh2PSdyQG9YAEM1TCGuWenLSuSUhf/irbVUNW9O5FhbFVONviN2TgMTBnUmyHv7E56rYnfLZK6TkiA==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.54.0.tgz",
+      "integrity": "sha512-CKsJ+g53QpsNPqbzUsfKVgd3Lny4yKZ1pP4qN3jdMOg/sisIDLGyDMezycquXLE5JsEU0wp3dGNdzig0/fmSVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.51.0",
-        "@typescript-eslint/parser": "8.51.0",
-        "@typescript-eslint/typescript-estree": "8.51.0",
-        "@typescript-eslint/utils": "8.51.0"
+        "@typescript-eslint/eslint-plugin": "8.54.0",
+        "@typescript-eslint/parser": "8.54.0",
+        "@typescript-eslint/typescript-estree": "8.54.0",
+        "@typescript-eslint/utils": "8.54.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -15800,6 +15894,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15837,9 +15932,9 @@
       }
     },
     "node_modules/vite-node/node_modules/vite": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz",
-      "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
+      "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15911,24 +16006,6 @@
         }
       }
     },
-    "node_modules/vite-node/node_modules/yaml": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
-      "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
     "node_modules/vitest": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
@@ -16053,6 +16130,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16090,11 +16168,12 @@
       }
     },
     "node_modules/vitest/node_modules/vite": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz",
-      "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
+      "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -16164,24 +16243,6 @@
         }
       }
     },
-    "node_modules/vitest/node_modules/yaml": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
-      "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
     "node_modules/w3c-xmlserializer": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
@@ -16337,9 +16398,9 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "version": "1.1.20",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
+      "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16464,9 +16525,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
+      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -16613,10 +16674,11 @@
       }
     },
     "node_modules/zod": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.4.tgz",
-      "integrity": "sha512-Zw/uYiiyF6pUT1qmKbZziChgNPRu+ZRneAsMUDU6IwmXdWt5JwcUfy2bvLOCUtz5UniaN/Zx5aFttZYbYc7O/A==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
+      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index 9a59e87a..2cb2b5ee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "history-app",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -25,51 +25,51 @@
     "babel-plugin-react-compiler": "^1.0.0",
     "camelcase": "^6.3.0",
     "color-thief-react": "^2.1.0",
-    "glob": "^13.0.0",
+    "glob": "^13.0.1",
     "h3-js": "^4.4.0",
     "heic-convert": "^2.1.0",
-    "mapbox-gl": "^3.17.0",
+    "mapbox-gl": "^3.18.1",
     "mime-types": "^3.0.2",
-    "next": "16.1.1",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "next": "^16.1.6",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
     "react-image-gallery": "^1.4.0",
     "react-map-gl": "^8.1.0",
     "sharp": "^0.34.5",
     "stylis": "^4.3.6",
-    "swr": "^2.3.8",
+    "swr": "^2.4.0",
     "xml2js": "^0.6.2",
-    "zod": "^4.3.4"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@eslint/js": "^9.28.0",
-    "@next/eslint-plugin-next": "16.1.1",
-    "@playwright/test": "^1.57.0",
+    "@next/eslint-plugin-next": "^16.1.1",
+    "@playwright/test": "^1.58.1",
     "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.1",
+    "@testing-library/react": "^16.3.2",
     "@types/boom": "^7.3.5",
     "@types/geojson": "^7946.0.16",
     "@types/heic-convert": "^2.1.0",
     "@types/jest": "^30.0.0",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^24.10.4",
-    "@types/react": "19.2.7",
+    "@types/node": "^24.10.10",
+    "@types/react": "19.2.10",
     "@types/react-dom": "19.2.3",
     "@types/react-image-gallery": "^1.2.4",
     "@types/xml2js": "^0.4.14",
     "@typescript-eslint/eslint-plugin": "^8.48.1",
     "@typescript-eslint/parser": "^8.48.1",
     "eslint": "^9.39.2",
-    "eslint-config-next": "16.1.1",
+    "eslint-config-next": "^16.1.6",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest-dom": "^5.5.0",
-    "eslint-plugin-jsdoc": "^61.5.0",
+    "eslint-plugin-jsdoc": "^61.7.1",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-testing-library": "^7.15.4",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "next-test-api-route-handler": "^5.0.3",
-    "snyk": "^1.1301.2",
+    "snyk": "^1.1302.1",
     "standard-version": "^9.5.0",
     "ts-jest": "^29.4.6",
     "tsx": "^4.21.0",
@@ -85,7 +85,7 @@
     "@testing-library/dom": "^10.4.1"
   },
   "overrides": {
-    "@types/react": "19.2.7",
+    "@types/react": "19.2.10",
     "@types/react-dom": "19.2.3"
   }
 }
diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index bff2b4d1..9d4b8f99 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -1,20 +1,23 @@
 'use client'
 
+import Button from '@mui/joy/Button'
+import Input from '@mui/joy/Input'
 import Option from '@mui/joy/Option'
 import Select from '@mui/joy/Select'
 import Stack from '@mui/joy/Stack'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import useSWR from 'swr'
 
-import { type AlbumResponseBody } from '../../lib/album'
+import type { SearchResult } from '../../../app/api/admin/search/route'
 import { type GalleryAlbumsBody } from '../../lib/albums'
 import { type Gallery } from '../../lib/galleries'
-import type { GalleryAlbum, Item } from '../../types/common'
+import type { GalleryAlbum, RawXmlAlbum, RawXmlItem } from '../../types/common'
 import Fields from './Fields'
 import Photo from './Photo'
 import Thumbs from './Thumbs'
+import { useEditCountPill } from './useEditCountPill'
 
-export type ItemState = Item | null
+export type XmlItemState = RawXmlItem | null
 
 const fetcher = (url: string) => fetch(url).then(r => r.json())
 
@@ -22,65 +25,297 @@ export default function AdminAlbumClient(
   { galleries, galleryAlbum, gallery }:
   { galleries: Gallery[], galleryAlbum: GalleryAlbumsBody, gallery: Gallery },
 ) {
+  const [currentGallery, setCurrentGallery] = useState<Gallery>(gallery)
   const [album, setAlbum] = useState<GalleryAlbum | null>(null)
-  const [item, setItem] = useState<ItemState>(null)
-  const { data, error } = useSWR<AlbumResponseBody>(album?.name ? `/api/galleries/${gallery}/albums/${album?.name}` : null, fetcher)
+  const [item, setItem] = useState<XmlItemState>(null)
+  const [currentIndex, setCurrentIndex] = useState<number>(-1)
+  const [selectedIndices, setSelectedIndices] = useState<Set<number>>(new Set())
+  const [searchQuery, setSearchQuery] = useState<string>('')
+  const [isSearching, setIsSearching] = useState(false)
+  const {
+    EditCountPill,
+    editedItems,
+    handleItemUpdate: handleItemUpdateOriginal,
+    handleXmlGenerated,
+    getItemWithEdits,
+    clearEdits,
+    applyEditsToItems,
+  } = useEditCountPill()
+  const { data, error, mutate } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${currentGallery}/${album?.name}` : null, fetcher)
+
+  const items = data?.album.item ? (Array.isArray(data.album.item) ? data.album.item : [data.album.item]) : []
+
+  const countFields = (item: RawXmlItem | null) => {
+    if (!item) return 0
+    let count = 0
+    for (const [key, value] of Object.entries(item)) {
+      if (key !== '$' && key !== 'filename' && value) {
+        count++
+      }
+    }
+    return count
+  }
+
+  const handleItemUpdateWrapper = (updatedItem: RawXmlItem) => {
+    // If multiple items are selected, apply the update to all of them
+    // preserving their specific ID and filename (each keeps its own filename)
+    if (selectedIndices.size > 1) {
+      selectedIndices.forEach(index => {
+        const targetItem = items[index]
+        if (!targetItem) return
+
+        const newItem = {
+          ...updatedItem,
+          $: targetItem.$,
+          filename: targetItem.filename,
+        }
+
+        handleItemUpdateOriginal(newItem)
+      })
+    } else {
+      handleItemUpdateOriginal(updatedItem)
+    }
+  }
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      // Don't trigger if user is typing in an input/textarea
+      const target = e.target as HTMLElement
+      if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA') {
+        return
+      }
+
+      let delta = 0
+
+      if (e.key === 'ArrowLeft') {
+        delta = -1
+      } else if (e.key === 'ArrowUp') {
+        delta = -4
+      } else if (e.key === 'ArrowRight') {
+        delta = 1
+      } else if (e.key === 'ArrowDown') {
+        delta = 4
+      }
+
+      if (delta !== 0 && items.length > 0) {
+        e.preventDefault()
+        const newIndex = Math.max(0, Math.min(items.length - 1, currentIndex + delta))
+        if (newIndex !== currentIndex) {
+          // Reset selection on navigation
+          setSelectedIndices(new Set([newIndex]))
+          setCurrentIndex(newIndex)
+          setItem(items[newIndex])
+        }
+      }
+    }
+
+    window.addEventListener('keydown', handleKeyDown)
+    return () => window.removeEventListener('keydown', handleKeyDown)
+  }, [currentIndex, items])
+
+  const handleItemSelect = (selectedItem: RawXmlItem, index: number, isShift: boolean = false) => {
+    let newSelectedIndices = new Set<number>()
+
+    if (isShift && currentIndex !== -1) {
+      // Range selection
+      const start = Math.min(currentIndex, index)
+      const end = Math.max(currentIndex, index)
+      // Keep existing selection if needed? Standard behavior usually anchors to last click.
+      // But let's assume standard shift-click behavior: select range from anchor to current.
+      // We don't track anchor separately loop, so we assume currentIndex is anchor.
+
+      // If we want to ADD to selection with CMD/Ctrl, we'd need that too, but user asked for Shift.
+      // For simplicity, just range select.
+      for (let i = start; i <= end; i++) {
+        newSelectedIndices.add(i)
+      }
+    } else {
+      newSelectedIndices.add(index)
+    }
+
+    setSelectedIndices(newSelectedIndices)
+    setCurrentIndex(index)
+
+    // Find the item with most fields among selected
+    let bestItem = items[index]
+    let maxFields = -1
+
+    newSelectedIndices.forEach(idx => {
+      const candidate = items[idx]
+      // Use the edited version if available to count fields?
+      // User said "Select the photo's XML value which has the most fields"
+      // Likely refers to current state.
+      const itemToCheck = getItemWithEdits(candidate) || candidate
+      const fields = countFields(itemToCheck)
+      if (fields > maxFields) {
+        maxFields = fields
+        bestItem = candidate
+      }
+    })
+
+    setItem(bestItem)
+  }
 
   const handleAlbumChange = (
     event: React.SyntheticEvent | null,
     newValue: string | null,
   ) => {
-    const selectedAlbum = galleryAlbum[gallery].albums.find(a => a.name === newValue)
+    const selectedAlbum = galleryAlbum[currentGallery].albums.find(a => a.name === newValue)
     if (selectedAlbum) {
       setAlbum(selectedAlbum)
+      // Clear edits when album changes
+      clearEdits()
+      setCurrentIndex(-1)
+      setItem(null)
+      setSelectedIndices(new Set())
+    }
+  }
+
+  const handleGalleryChange = (
+    event: React.SyntheticEvent | null,
+    newValue: string | null,
+  ) => {
+    if (newValue) {
+      setCurrentGallery(newValue as Gallery)
+      setAlbum(null)
+      // Clear edits when gallery changes
+      clearEdits()
+      setItem(null)
+      setCurrentIndex(-1)
+      setSelectedIndices(new Set())
+    }
+  }
+
+  const handleSearch = async () => {
+    if (!searchQuery.trim()) return
+
+    setIsSearching(true)
+    try {
+      const response = await fetch(`/api/admin/search?query=${encodeURIComponent(searchQuery)}`)
+      const data: { results: SearchResult[] } = await response.json()
+
+      if (data.results && data.results.length > 0) {
+        // Load the first result automatically
+        const firstResult = data.results[0]
+        setCurrentGallery(firstResult.gallery)
+
+        const selectedAlbum = galleryAlbum[firstResult.gallery].albums.find(a => a.name === firstResult.album)
+        if (selectedAlbum) {
+          setAlbum(selectedAlbum)
+          setCurrentIndex(firstResult.index)
+        }
+      } else {
+        alert('No matching files found')
+      }
+    } catch (error) {
+      console.error('Search failed:', error)
+      alert('Search failed')
+    } finally {
+      setIsSearching(false)
+    }
+  }
+
+  const handleSearchKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === 'Enter') {
+      e.preventDefault()
+      handleSearch()
     }
   }
 
+  // Update the item when currentIndex changes and items are available
+  useEffect(() => {
+    if (items.length > 0 && currentIndex >= 0 && currentIndex < items.length) {
+      setItem(items[currentIndex])
+    }
+  }, [currentIndex, items])
+
   return (
     <form>
-        {item && <Fields albumEntity={data?.album} item={item}>
-          <Photo item={item} />
-        </Fields>}
-        <Stack
-          direction="row"
-          spacing={2}
-          sx={{
-            alignItems: 'center',
+      <EditCountPill />
+      <Stack
+        direction="row"
+        spacing={2}
+        sx={{
+          alignItems: 'center',
+          marginBottom: 2,
+        }}
+      >
+        <label htmlFor="search-filename">Search Filename</label>
+        <Input
+          id="search-filename"
+          placeholder="Enter filename..."
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          onKeyDown={handleSearchKeyDown}
+          sx={{ flexGrow: 1 }}
+        />
+        <Button onClick={handleSearch} disabled={isSearching} variant="solid">
+          {isSearching ? 'Searching...' : 'Search'}
+        </Button>
+
+        <label htmlFor="select-gallery-label" id="select-gallery">Gallery</label>
+        <Select
+          value={currentGallery}
+          onChange={handleGalleryChange}
+          slotProps={{
+            button: {
+              id: 'select-gallery-label',
+              'aria-labelledby': 'select-gallery select-gallery-label',
+            },
+          }}
+          variant='solid'
+        >
+          <Option value="">Select a Gallery</Option>
+          {galleries.map(gallery => <Option key={gallery} value={gallery}>{gallery}</Option>)}
+        </Select>
+
+        <label htmlFor="select-album-label" id="select-album">Album</label>
+        <Select
+          value={album?.name ?? ''}
+          onChange={handleAlbumChange}
+          slotProps={{
+            button: {
+              id: 'select-album-label',
+              'aria-labelledby': 'select-album select-album-label',
+            },
           }}
+          variant='solid'
         >
-          <label htmlFor="select-gallery-label" id="select-gallery">Gallery</label>
-          <Select
-            defaultValue={gallery}
-            slotProps={{
-              button: {
-                id: 'select-gallery-label',
-                'aria-labelledby': 'select-gallery select-gallery-label',
-              },
-            }}
-            variant='solid'
-          >
-            <Option value="">Select a Gallery</Option>
-            {galleries.map(gallery => <Option key={gallery} value={gallery}>{gallery}</Option>)}
-          </Select>
-
-          <label htmlFor="select-album-label" id="select-album">Album</label>
-          <Select
-            defaultValue=""
-            onChange={handleAlbumChange}
-            slotProps={{
-              button: {
-                id: 'select-album-label',
-                'aria-labelledby': 'select-album select-album-label',
-              },
-            }}
-            variant='solid'
-          >
-            <Option value="">Select a Album</Option>
-            {galleryAlbum[gallery].albums.map(album => <Option key={album.name} value={album.name}>{album.name}</Option>)}
-          </Select>
+          <Option value="">Select a Album</Option>
+          {galleryAlbum[currentGallery].albums.map(album => <Option key={album.name} value={album.name}>{album.name}</Option>)}
+        </Select>
+      </Stack>
+      {error && <div>{JSON.stringify(error)}</div>}
+      {!error && data ? (
+        <Stack direction="row" spacing={2} sx={{ alignItems: 'flex-start' }}>
+          <Stack sx={{ flex: 1, minWidth: 0 }}>
+            <Thumbs
+              xmlAlbum={data}
+              gallery={currentGallery}
+              setItem={handleItemSelect}
+              currentIndex={currentIndex}
+              selectedIndices={selectedIndices}
+            />
+          </Stack>
+          {item && (
+            <Stack sx={{ position: 'sticky', top: 16, alignSelf: 'flex-start' }}>
+              <Fields
+                xmlAlbum={data}
+                gallery={currentGallery}
+                item={getItemWithEdits(item)}
+                onItemUpdate={handleItemUpdateWrapper}
+                onXmlGenerated={handleXmlGenerated}
+                editedItems={editedItems}
+                applyEditsToItems={applyEditsToItems}
+              >
+                <Photo item={item} gallery={currentGallery} size="small" />
+              </Fields>
+            </Stack>
+          )}
         </Stack>
-        {error && <div>{JSON.stringify(error)}</div>}
-        {!error && data && data.album ? <Thumbs album={data.album} setItem={setItem} /> : <div>Select an album</div>}
-      </form>
+      ) : (
+        <div>Select an album</div>
+      )}
+    </form>
   )
 }
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 374b0433..8ce1eb3b 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -1,33 +1,373 @@
+import Button from '@mui/joy/Button'
+import Checkbox from '@mui/joy/Checkbox'
+import IconButton from '@mui/joy/IconButton'
 import Input from '@mui/joy/Input'
+import Option from '@mui/joy/Option'
+import Select from '@mui/joy/Select'
 import Stack from '@mui/joy/Stack'
+import Textarea from '@mui/joy/Textarea'
+import { useEffect, useRef, useState } from 'react'
+import useSWR from 'swr'
+import xml2js from 'xml2js'
 
-import { type AlbumResponseBody } from '../../lib/album'
-import { type ItemState } from './AdminAlbumClient'
-import Xml from './Xml'
+import type { Gallery, IndexedKeywords, ItemReferenceSource, RawXmlAlbum, RawXmlItem } from '../../types/common'
+import { transformReference } from '../../utils/reference'
+import ComboBox from '../ComboBox'
+import { type XmlItemState } from './AdminAlbumClient'
+import type { EditCountPillHook } from './useEditCountPill'
+import { useGeoCopy } from './useGeoCopy'
+
+const fetcher = (url: string) => fetch(url).then(r => r.json())
+
+const REFERENCE_SOURCES: ItemReferenceSource[] = ['facebook', 'google', 'instagram', 'wikipedia', 'youtube']
+
+// Parse DMS (Degrees Minutes Seconds) format to decimal
+// Supports formats like: 50° 22' 51.51" N or 50°22'51.51"N or 50 22 51.51 N
+function parseDMS(dms: string): number | null {
+  const dmsPattern = /(\d+)[°\s]+(\d+)['\s]+(\d+(?:\.\d+)?)["\s]*([NSEW])?/i
+  const match = dms.trim().match(dmsPattern)
+
+  if (!match) return null
+
+  const degrees = parseFloat(match[1])
+  const minutes = parseFloat(match[2])
+  const seconds = parseFloat(match[3])
+  const direction = match[4]?.toUpperCase()
+
+  let decimal = degrees + minutes / 60 + seconds / 3600
+
+  // Negate if South or West
+  if (direction === 'S' || direction === 'W') {
+    decimal = -decimal
+  }
+
+  return decimal
+}
 
 export default function Fields(
-  { albumEntity, item, children }:
-  { albumEntity: AlbumResponseBody['album'] | undefined, item: ItemState, children: React.ReactElement },
+  { xmlAlbum, gallery, item, children, onItemUpdate, onXmlGenerated, editedItems, applyEditsToItems }:
+  {
+    xmlAlbum: RawXmlAlbum | undefined,
+    gallery: Gallery,
+    item: XmlItemState,
+    children: React.ReactElement,
+    onItemUpdate: EditCountPillHook['handleItemUpdate'],
+    onXmlGenerated: EditCountPillHook['handleXmlGenerated'],
+    editedItems: EditCountPillHook['editedItems'],
+    applyEditsToItems: EditCountPillHook['applyEditsToItems']
+  },
 ) {
+  const [editedItem, setEditedItem] = useState<RawXmlItem | null>(item)
+  const [xmlOutput, setXmlOutput] = useState<string>('')
+  const [autocompleteValue, setAutocompleteValue] = useState<string>('')
+  const updatePendingRef = useRef(false)
+  const GeoCopyButton = useGeoCopy(editedItem)
+
+  // Fetch all available keywords from all albums
+  const { data: keywordsData } = useSWR<{ keywords: IndexedKeywords[] }>('/api/admin/keywords', fetcher)
+  const allKeywords = keywordsData?.keywords ?? []
+
+  useEffect(() => {
+    if (updatePendingRef.current) return
+    setEditedItem(item)
+    setXmlOutput('')
+    setAutocompleteValue('')
+  }, [item])
+
+  // Notify parent after editedItem updates (after render)
+  useEffect(() => {
+    if (updatePendingRef.current && editedItem) {
+      updatePendingRef.current = false
+      onItemUpdate(editedItem)
+    }
+  }, [editedItem, onItemUpdate])
+
+  // Wrapper to update local state and schedule parent notification
+  const updateItem = (updater: (prev: RawXmlItem | null) => RawXmlItem | null) => {
+    updatePendingRef.current = true
+    setEditedItem(updater)
+  }
+
+  const generateXml = () => {
+    if (!xmlAlbum) return
+
+    // Get all items from XML
+    const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
+
+    // Apply all edits from editedItems state and maintain proper field ordering
+    const updatedItems = applyEditsToItems(items)
+
+    // Build XML album structure
+    const albumXml = {
+      meta: xmlAlbum.album.meta,
+      item: updatedItems.length === 1 ? updatedItems[0] : updatedItems,
+    }
+
+    // Convert to XML
+    const builder = new xml2js.Builder({
+      rootName: 'album',
+      renderOpts: { pretty: true, indent: '\t' },
+      xmldec: { version: '1.0', encoding: 'UTF-8' },
+    })
+
+    const xml = builder.buildObject(albumXml)
+    setXmlOutput(xml)
+
+    // Reset the counter of edits since generation
+    onXmlGenerated()
+  }
+
+  const rawFilename = editedItem?.filename ? (Array.isArray(editedItem.filename) ? editedItem.filename[0] : editedItem.filename) : ''
+  const isVideo = editedItem?.type === 'video'
+
+  const swapFilenameExt = (fn: string, toVideo: boolean): string => {
+    const lastDot = fn.lastIndexOf('.')
+    const base = lastDot === -1 ? fn : fn.slice(0, lastDot)
+    return toVideo ? `${base}.mp4` : `${base}.jpg`
+  }
+
+  const displayFilename = rawFilename ? swapFilenameExt(rawFilename, isVideo) : ''
+
   return (
     <>
-      <Stack
-        direction="row"
-        spacing={2}
-        sx={{
-          alignItems: 'center',
-        }}
-      >
-        {children}
-        <Stack direction="column">
-          <Input value={item?.filename} />
-          <Input value={item?.city} />
-          <Input value={item?.location ?? ''} />
-          <Input value={item?.caption} />
-          <Input value={item?.description ?? ''} />
-          <Input value={item?.search ?? ''} />
-          <Xml jsonBlob={JSON.stringify(albumEntity)} />
+      <Stack direction="column" spacing={2} sx={{ width: '35rem', flexShrink: 0 }}>
+        <Stack direction="row" spacing={1} alignItems="center" sx={{ minWidth: 0 }}>
+          <Input
+            value={displayFilename}
+            readOnly
+            placeholder="Filename"
+            title="Filename (read-only)"
+            sx={{ flex: 1, minWidth: 0 }}
+          />
+          <Checkbox
+            checked={isVideo}
+            onChange={(e) => updateItem((prev: RawXmlItem | null) => {
+              if (!prev) return null
+              const checked = e.target.checked
+              const currentFn = Array.isArray(prev.filename) ? prev.filename[0] : prev.filename
+              const newFn = swapFilenameExt(currentFn ?? '', checked)
+              const newFilename = Array.isArray(prev.filename) ? [newFn, ...prev.filename.slice(1)] : newFn
+              if (checked) return { ...prev, type: 'video', filename: newFilename }
+              const { type: _t, ...rest } = prev
+              return { ...rest, filename: newFilename } as RawXmlItem
+            })}
+            label="Video item"
+            title="Item type: photo (unchecked) or video (checked). Toggles &lt;type&gt;video&lt;/type&gt; and filename extension (.jpg ↔ .mp4)."
+            slotProps={{ label: { sx: { color: '#E0E0E0' } } }}
+          />
         </Stack>
+        <Input
+          value={editedItem?.photo_city ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_city: e.target.value } : null)}
+          placeholder="City"
+          title="City (photo_city)"
+        />
+        <Input
+          value={editedItem?.photo_loc ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_loc: e.target.value } : null)}
+          placeholder="Location"
+          title="Location (photo_loc)"
+        />
+        <Textarea
+          value={editedItem?.photo_desc ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_desc: e.target.value } : null)}
+          placeholder="Description"
+          title="Description (photo_desc)"
+          minRows={2}
+        />
+        <Input
+          value={editedItem?.thumb_caption ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, thumb_caption: e.target.value } : null)}
+          placeholder="Caption"
+          title="Caption (thumb_caption)"
+        />
+        <Input
+          value={editedItem?.search ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, search: e.target.value } : null)}
+          placeholder="Search keywords"
+          title="Search keywords (comma-separated)"
+        />
+        <ComboBox
+          className="keyword-autocomplete"
+          options={allKeywords}
+          value={null}
+          inputValue={autocompleteValue}
+          onInputChange={(newValue) => {
+            setAutocompleteValue(newValue)
+          }}
+          onChange={({ value }) => {
+            // Append the selected keyword to the existing search field
+            updateItem((prev: RawXmlItem | null) => {
+              if (!prev) return null
+              const currentSearch = prev.search ?? ''
+              const separator = currentSearch && !currentSearch.endsWith(', ') ? ', ' : ''
+              return { ...prev, search: currentSearch + separator + value }
+            })
+            // Clear the autocomplete input
+            setAutocompleteValue('')
+          }}
+        />
+        <Stack direction="row" spacing={1}>
+          <Input
+            value={editedItem?.geo?.lat ?? ''}
+            onChange={(e) => {
+              const value = e.target.value
+
+              // Check if value contains DMS format (degrees, minutes, seconds)
+              if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
+                // Split by comma to check for lat,lon DMS pair
+                const parts = value.split(',').map(s => s.trim())
+
+                if (parts.length === 2) {
+                  // Parse both lat and lon as DMS
+                  const lat = parseDMS(parts[0])
+                  const lon = parseDMS(parts[1])
+                  if (lat !== null && lon !== null) {
+                    updateItem((prev: RawXmlItem | null) => prev ? {
+                      ...prev,
+                      geo: { lat: lat.toString(), lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
+                    } : null)
+                    return
+                  }
+                } else {
+                  // Single DMS value for latitude only
+                  const lat = parseDMS(value)
+                  if (lat !== null) {
+                    updateItem((prev: RawXmlItem | null) => prev ? {
+                      ...prev,
+                      geo: { lat: lat.toString(), lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' },
+                    } : null)
+                    return
+                  }
+                }
+              }
+
+              // Check if the value contains a comma (decimal lat,lon format)
+              if (value.includes(',')) {
+                const [lat, lon] = value.split(',').map(s => s.trim())
+                updateItem((prev: RawXmlItem | null) => prev ? {
+                  ...prev,
+                  geo: { lat: lat || '', lon: lon || '', accuracy: prev.geo?.accuracy || '' },
+                } : null)
+              } else {
+                // Plain value for latitude
+                const lat = value
+                updateItem((prev: RawXmlItem | null) => prev ? {
+                  ...prev,
+                  geo: lat || prev.geo?.lon ? { lat, lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' } : undefined,
+                } : null)
+              }
+            }}
+            placeholder="Latitude (or lat,lon or DMS)"
+            title="Latitude (geo.lat) - paste lat,lon or DMS format to auto-split"
+            sx={{ flex: 1, minWidth: 0 }}
+          />
+          <Input
+            value={editedItem?.geo?.lon ?? ''}
+            onChange={(e) => {
+              const value = e.target.value
+
+              // Check if value contains DMS format
+              if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
+                const lon = parseDMS(value)
+                if (lon !== null) {
+                  updateItem((prev: RawXmlItem | null) => prev ? {
+                    ...prev,
+                    geo: { lat: prev.geo?.lat || '', lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
+                  } : null)
+                  return
+                }
+              }
+
+              // Plain value for longitude
+              const lon = value
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                geo: lon || prev.geo?.lat ? { lat: prev.geo?.lat || '', lon, accuracy: prev.geo?.accuracy || '' } : undefined,
+              } : null)
+            }}
+            placeholder="Longitude (or DMS)"
+            title="Longitude (geo.lon) - paste DMS format to convert"
+            sx={{ flex: 1, minWidth: 0 }}
+          />
+          <GeoCopyButton />
+
+          <Input
+            value={editedItem?.geo?.accuracy ?? ''}
+            onChange={(e) => {
+              const accuracy = e.target.value
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                geo: prev.geo ? { ...prev.geo, accuracy } : undefined,
+              } : null)
+            }}
+            placeholder="Accuracy"
+            title="Coordinate accuracy (geo.accuracy)"
+            type="number"
+            sx={{ flex: 0.6, minWidth: 0 }}
+          />
+        </Stack>
+        <Stack direction="row" spacing={2}>
+          <Select
+            value={editedItem?.ref?.source ?? ''}
+            onChange={(_, value) => {
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                ref: value ? { source: value as ItemReferenceSource, name: prev.ref?.name || '' } : undefined,
+              } : null)
+            }}
+            placeholder="Reference Source"
+            title="Reference source (ref.source)"
+            sx={{ flex: 1, minWidth: 0 }}
+          >
+            <Option value="">None</Option>
+            {REFERENCE_SOURCES.map(source => (
+              <Option key={source} value={source}>{source.charAt(0).toUpperCase() + source.slice(1)}</Option>
+            ))}
+          </Select>
+          <Input
+            value={editedItem?.ref?.name ?? ''}
+            onChange={(e) => {
+              const name = e.target.value
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                ref: prev.ref?.source ? { source: prev.ref.source, name } : undefined,
+              } : null)
+            }}
+            placeholder="Reference Name"
+            title="Reference name/ID (ref.name)"
+            sx={{ flex: 1, minWidth: 0 }}
+          />
+          <IconButton
+            size="sm"
+            variant="outlined"
+            onClick={() => {
+              const reference = transformReference(editedItem?.ref)
+              if (reference) {
+                navigator.clipboard.writeText(reference[0])
+              }
+            }}
+            disabled={!editedItem?.ref?.source || !editedItem?.ref?.name}
+            title="Copy reference URL to clipboard"
+            aria-label="Copy reference URL to clipboard"
+            sx={{ minWidth: 'auto', px: 1 }}
+          >
+            📋
+          </IconButton>
+        </Stack>
+        <Button onClick={generateXml} variant="solid" color="primary">
+          Generate XML
+        </Button>
+        {children}
+        {xmlOutput && (
+          <Textarea
+            value={xmlOutput}
+            readOnly
+            minRows={10}
+            maxRows={20}
+            placeholder="Generated XML will appear here"
+          />
+        )}
       </Stack>
     </>
   )
diff --git a/src/components/AdminAlbum/Photo.tsx b/src/components/AdminAlbum/Photo.tsx
index 973e7d84..d23e2dfc 100644
--- a/src/components/AdminAlbum/Photo.tsx
+++ b/src/components/AdminAlbum/Photo.tsx
@@ -1,12 +1,22 @@
 import Button from '@mui/joy/Button'
+import IconButton from '@mui/joy/IconButton'
 import Stack from '@mui/joy/Stack'
 import useSWRMutation from 'swr/mutation'
 
 import type { Prediction } from '../../../app/api/admin/classify/route'
+import { originalPath, photoPath } from '../../lib/paths'
 import config from '../../models/config'
+import type { Gallery, RawXmlItem } from '../../types/common'
 import Img from '../Img'
 import Link from '../Link'
-import type { ItemState } from './AdminAlbumClient'
+
+function OpenInNewIcon() {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="currentColor" aria-hidden>
+      <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z" />
+    </svg>
+  )
+}
 
 const fetcher = async (url: string, { arg }: { arg: string }) =>
   fetch(url, {
@@ -15,27 +25,48 @@ const fetcher = async (url: string, { arg }: { arg: string }) =>
     body: JSON.stringify({ path: arg }),
   }).then((res) => res.json())
 
-export default function AdminAlbumPhoto({ item }: { item: ItemState }) {
+export default function AdminAlbumPhoto(
+  { item, gallery, size = 'default' }:
+  { item: RawXmlItem, gallery: Gallery, size?: 'default' | 'small' },
+) {
   const { trigger, data, error, isMutating } = useSWRMutation(
     '/api/admin/classify',
     fetcher,
   )
 
-  if (!item?.photoPath) return <div>No photo</div>
+  const photoSrc = photoPath(item.filename, gallery)
+  const originalSrc = originalPath(item.filename, gallery)
+  const dimensions = size === 'small' ? config.resizeDimensions.preview : config.resizeDimensions.photo
 
   return (
     <>
       <Stack direction="column">
-        <Img
-          src={item.photoPath}
-          alt={item.caption}
-          width={config.resizeDimensions.photo.width-200}
-          height={config.resizeDimensions.photo.height-200}
-        />
+        <Stack direction="row" alignItems="flex-start" spacing={1} sx={{ position: 'relative' }}>
+          <Img
+            src={photoSrc}
+            alt={item.thumb_caption || 'Photo'}
+            width={dimensions.width - 20}
+            height={dimensions.height - 20}
+          />
+          <IconButton
+            component={Link}
+            href={originalSrc}
+            target="_blank"
+            rel="noopener noreferrer"
+            variant="soft"
+            color="primary"
+            size="sm"
+            title="Open original image in new tab"
+            aria-label="Open original image in new tab"
+            sx={{ flexShrink: 0, mt: 0.5 }}
+          >
+            <OpenInNewIcon />
+          </IconButton>
+        </Stack>
         <Button
           onClick={(e) => {
             e.preventDefault()
-            trigger(item.photoPath)
+            trigger(photoSrc)
           }}
         >
           Classify Image
diff --git a/src/components/AdminAlbum/Thumbs.tsx b/src/components/AdminAlbum/Thumbs.tsx
index 287daf0d..6cf17769 100644
--- a/src/components/AdminAlbum/Thumbs.tsx
+++ b/src/components/AdminAlbum/Thumbs.tsx
@@ -1,29 +1,44 @@
-import { type Dispatch, type SetStateAction } from 'react'
-
-import { AlbumResponseBody } from '../../lib/album'
+import { thumbPath } from '../../lib/paths'
+import type { Gallery, RawXmlAlbum, RawXmlItem } from '../../types/common'
 import styles from '../Album/styles.module.css'
 import ThumbImg from '../ThumbImg'
-import { ItemState } from './AdminAlbumClient'
 
 export default function AdminAlbumThumbs(
-  { album, setItem }:
-  { album: AlbumResponseBody['album'] | undefined, setItem: Dispatch<SetStateAction<ItemState>> },
+  { xmlAlbum, gallery, setItem, currentIndex, selectedIndices }:
+  {
+    xmlAlbum: RawXmlAlbum,
+    gallery: Gallery,
+    setItem: (item: RawXmlItem, index: number, isShift?: boolean) => void,
+    currentIndex: number,
+    selectedIndices?: Set<number>
+  },
 ) {
-  if (!album) return <div>Loading...</div>
+  const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
+  const hasMultiSelection = (selectedIndices?.size ?? 0) > 1
+
+  if (items.length === 0) {
+    return <div>No items found</div>
+  }
 
   return (
     <>
       <ul className={styles.thumbWrapper}>
-        {album.items.map((item) => (
-          <ThumbImg
-            onClick={() => setItem(item)}
-            src={item.thumbPath}
-            caption={item.caption}
-            key={item.filename.toString()}
-            id={`select${item.id}`}
-            viewed={false}
-          />
-        ))}
+        {items.map((item, index) => {
+          const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+          const caption = item.thumb_caption || filename
+          const isSelected = selectedIndices ? selectedIndices.has(index) : index === currentIndex
+          return (
+            <ThumbImg
+              onClick={(e) => setItem(item, index, e.shiftKey)}
+              src={thumbPath(item.filename, gallery)}
+              caption={caption}
+              key={filename}
+              id={`select${item.$.id}`}
+              viewed={isSelected}
+              multiSelected={hasMultiSelection && isSelected}
+            />
+          )
+        })}
       </ul>
     </>
   )
diff --git a/src/components/AdminAlbum/Xml.tsx b/src/components/AdminAlbum/Xml.tsx
deleted file mode 100644
index 26cbfd6a..00000000
--- a/src/components/AdminAlbum/Xml.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Textarea } from '@mui/joy'
-
-export default function Fields({ jsonBlob }: { jsonBlob: string | undefined }) {
-  return (
-    <>
-      <Textarea defaultValue={jsonBlob} maxRows={5} />
-    </>
-  )
-}
diff --git a/src/components/AdminAlbum/useEditCountPill.tsx b/src/components/AdminAlbum/useEditCountPill.tsx
new file mode 100644
index 00000000..300516b9
--- /dev/null
+++ b/src/components/AdminAlbum/useEditCountPill.tsx
@@ -0,0 +1,142 @@
+import Chip from '@mui/joy/Chip'
+import type { JSX } from 'react'
+import { useState } from 'react'
+import type { RawXmlItem } from '../../types/common'
+
+export type EditCountPillHook = {
+  EditCountPill: () => JSX.Element | null
+  editedItems: Record<string, RawXmlItem>
+  handleItemUpdate: (updatedItem: RawXmlItem) => void
+  handleXmlGenerated: () => void
+  getItemWithEdits: (itemToGet: RawXmlItem | null) => RawXmlItem | null
+  clearEdits: () => void
+  applyEditsToItems: (items: RawXmlItem[]) => RawXmlItem[]
+}
+
+export function useEditCountPill(): EditCountPillHook {
+  // Store edits for all items by ID - persist across photo switches
+  const [editedItems, setEditedItems] = useState<Record<string, RawXmlItem>>({})
+  // Track edits made since last XML generation
+  const [editsSinceGeneration, setEditsSinceGeneration] = useState<Set<string>>(new Set())
+
+  const handleItemUpdate = (updatedItem: RawXmlItem) => {
+    setEditedItems(prev => ({
+      ...prev,
+      [updatedItem.$.id]: updatedItem,
+    }))
+    // Track this item as edited since last generation
+    setEditsSinceGeneration(prev => new Set(prev).add(updatedItem.$.id))
+  }
+
+  const handleXmlGenerated = () => {
+    // Reset the counter of edits since generation, but keep the actual edits
+    setEditsSinceGeneration(new Set())
+  }
+
+  const clearEdits = () => {
+    setEditedItems({})
+    setEditsSinceGeneration(new Set())
+  }
+
+  // Get item with edits applied if they exist
+  const getItemWithEdits = (itemToGet: RawXmlItem | null): RawXmlItem | null => {
+    if (!itemToGet) return null
+    return editedItems[itemToGet.$.id] || itemToGet
+  }
+
+  // Helper to remove empty/null/undefined properties recursively
+  function removeEmpty<T>(obj: T): T | undefined
+  function removeEmpty(obj: unknown): unknown {
+    if (obj === null || obj === undefined || obj === '') return undefined
+    if (typeof obj !== 'object') return obj
+    if (Array.isArray(obj)) return obj.map(removeEmpty).filter((v) => v !== undefined)
+
+    const cleaned: Record<string, unknown> = {}
+    for (const [key, value] of Object.entries(obj)) {
+      const cleanedValue = removeEmpty(value)
+      if (cleanedValue !== undefined) {
+        cleaned[key] = cleanedValue
+      }
+    }
+    return Object.keys(cleaned).length > 0 ? cleaned : undefined
+  }
+
+  // Apply all edits from editedItems state and maintain XML field order:
+  // $, type, size, filename, then photo_*, then search, geo, ref (type before filename for video)
+  const applyEditsToItems = (items: RawXmlItem[]): RawXmlItem[] => {
+    return items.map((originalItem: RawXmlItem) => {
+      const edited = editedItems[originalItem.$.id]
+      if (!edited) return originalItem
+
+      const {
+        $,
+        type,
+        size,
+        filename,
+        search,
+        geo,
+        ref,
+        photo_date,
+        photo_city,
+        photo_loc,
+        thumb_caption,
+        photo_desc,
+        ...rest
+      } = edited
+
+      const orderedItem: RawXmlItem = {
+        $,
+        ...(type && { type }),
+        ...(size && { size }),
+        filename,
+        photo_date: photo_date ?? null,
+        photo_city: photo_city ?? '',
+        ...(photo_loc !== undefined && photo_loc !== '' && { photo_loc }),
+        ...(thumb_caption !== undefined && thumb_caption !== '' && { thumb_caption }),
+        ...(photo_desc !== undefined && photo_desc !== '' && { photo_desc }),
+        ...rest,
+        ...(search !== undefined && search !== null && search !== '' && { search }),
+        ...(geo && { geo }),
+        ...(ref && { ref }),
+      }
+
+      // Remove empty properties
+      const cleaned = removeEmpty(orderedItem)
+      return cleaned ?? originalItem
+    }).filter((item): item is RawXmlItem => item !== undefined)
+  }
+
+  const EditCountPill = () => {
+    const count = editsSinceGeneration.size
+    if (count === 0) return null
+
+    return (
+      <Chip
+        color="primary"
+        size="lg"
+        variant="solid"
+        sx={{
+          position: 'fixed',
+          top: '1rem',
+          left: '50%',
+          transform: 'translateX(-50%)',
+          zIndex: 1000,
+          fontSize: '1rem',
+          paddingX: '1.5rem',
+          paddingY: '0.75rem',
+          boxShadow: '0 4px 12px rgba(0, 0, 0, 0.15)',
+          animation: count > 0 ? 'pulse 0.3s ease-in-out' : 'none',
+          '@keyframes pulse': {
+            '0%': { transform: 'translateX(-50%) scale(1)' },
+            '50%': { transform: 'translateX(-50%) scale(1.1)' },
+            '100%': { transform: 'translateX(-50%) scale(1)' },
+          },
+        }}
+      >
+        {count} {count === 1 ? 'photo edited' : 'photos edited'}
+      </Chip>
+    )
+  }
+
+  return { EditCountPill, editedItems, handleItemUpdate, handleXmlGenerated, getItemWithEdits, clearEdits, applyEditsToItems }
+}
diff --git a/src/components/AdminAlbum/useGeoCopy.tsx b/src/components/AdminAlbum/useGeoCopy.tsx
new file mode 100644
index 00000000..dc72fe04
--- /dev/null
+++ b/src/components/AdminAlbum/useGeoCopy.tsx
@@ -0,0 +1,41 @@
+import IconButton from '@mui/joy/IconButton'
+import { useState } from 'react'
+import type { RawXmlItem } from '../../types/common'
+
+export function useGeoCopy(editedItem: RawXmlItem | null) {
+  const [copyMode, setCopyMode] = useState<'coords' | 'maps'>('coords')
+
+  const copyGeoCoordinates = () => {
+    const lat = editedItem?.geo?.lat ?? ''
+    const lon = editedItem?.geo?.lon ?? ''
+
+    if (!lat || !lon) return
+
+    if (copyMode === 'coords') {
+      navigator.clipboard.writeText(`${lat}, ${lon}`)
+      setCopyMode('maps')
+    } else {
+      navigator.clipboard.writeText(`https://www.google.ca/maps/place/${lat}, ${lon}`)
+      setCopyMode('coords')
+    }
+  }
+
+  const title = copyMode === 'coords' ? 'Copy coordinates' : 'Copy Google Maps URL'
+  const disabled = !editedItem?.geo?.lat || !editedItem?.geo?.lon
+
+  const GeoCopyButton = () => (
+    <IconButton
+      size="sm"
+      variant="outlined"
+      onClick={copyGeoCoordinates}
+      disabled={disabled}
+      title={title}
+      aria-label={title}
+      sx={{ minWidth: 'auto', px: 1 }}
+    >
+      📋
+    </IconButton>
+  )
+
+  return GeoCopyButton
+}
diff --git a/src/components/Album/AlbumClient.tsx b/src/components/Album/AlbumClient.tsx
index bc9b55af..dd3d5596 100644
--- a/src/components/Album/AlbumClient.tsx
+++ b/src/components/Album/AlbumClient.tsx
@@ -31,6 +31,8 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
+    isClearing,
+    clearCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
   const searchParams = useSearchParams()
@@ -38,12 +40,18 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
 
   useEffect(() => {
     if (!selectId || itemsToShow.length === 0) return
-    const idx = itemsToShow.findIndex(i => i.id === selectId)
-    if (idx >= 0) {
+    const idx = itemsToShow.findIndex(i => {
+      const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+      return filename === selectId
+    })
+
+    // Only slide if we found the item (idx >= 0) AND the gallery isn't already at that index
+    if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
       refImageGallery.current?.slideToIndex(idx)
       setMemoryIndex(idx)
+      setViewed(idx)
     }
-  }, [selectId, itemsToShow, refImageGallery, setMemoryIndex])
+  }, [selectId, itemsToShow, refImageGallery, setMemoryIndex, setViewed])
 
   return (
     <div>
@@ -58,6 +66,8 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
+          isClearing={isClearing}
+          clearCoordinates={clearCoordinates}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/Albums/index.tsx b/src/components/Albums/index.tsx
index a29a9c3c..e13bfaa6 100644
--- a/src/components/Albums/index.tsx
+++ b/src/components/Albums/index.tsx
@@ -12,7 +12,7 @@ interface InputProps {
 function Galleries({ items, gallery }: InputProps) {
   const { width, height } = config.resizeDimensions.thumb
   return items.map((album) => (
-    <div key={album.name} className={styles.albums}>
+    <div data-type="gallery" key={album.name} className={styles.albums}>
       <Link href={`/${gallery}/${album.name}`}>
         <Img src={album.thumbPath} alt={album.name} width={width} height={height} />
       </Link>
diff --git a/src/components/All/AllClient.tsx b/src/components/All/AllClient.tsx
index 6ad2fb4d..8670294e 100644
--- a/src/components/All/AllClient.tsx
+++ b/src/components/All/AllClient.tsx
@@ -1,6 +1,7 @@
 'use client'
 
-import { useMemo } from 'react'
+import { useMemo, useEffect } from 'react'
+import { useSearchParams } from 'next/navigation'
 
 import config from '../../../src/models/config'
 import useMapFilter from '../../hooks/useMapFilter'
@@ -24,8 +25,35 @@ export default function AllClient({ items, indexedKeywords, clusteredMarkers }:
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
+    isClearing,
+    clearCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
+  const searchParams = useSearchParams()
+  const selectId = searchParams.get('select')
+
+  // Handle URL ?select= parameter
+  useEffect(() => {
+    if (!selectId || itemsToShow.length === 0) return
+
+    const idx = itemsToShow.findIndex(i => {
+      const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+      return filename === selectId
+    })
+
+    if (idx >= 0) {
+      // Use timeout to allow gallery to process items update (which might reset index)
+      // before enforcing the selected index
+      setTimeout(() => {
+        if (refImageGallery.current?.getCurrentIndex?.() !== idx) {
+          refImageGallery.current?.slideToIndex(idx)
+          setMemoryIndex(idx)
+          setViewed(idx)
+        }
+      }, 0)
+    }
+  }, [selectId, itemsToShow, refImageGallery, setMemoryIndex, setViewed])
+
   return (
     <div>
       <AlbumContext.Provider value={zooms}>
@@ -39,6 +67,8 @@ export default function AllClient({ items, indexedKeywords, clusteredMarkers }:
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
+          isClearing={isClearing}
+          clearCoordinates={clearCoordinates}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/All/Items.tsx b/src/components/All/Items.tsx
index cb04c33c..8fb026d9 100644
--- a/src/components/All/Items.tsx
+++ b/src/components/All/Items.tsx
@@ -24,7 +24,7 @@ function All({ items, keyword, refImageGallery }: InputProps) {
       {items.map((item, index) => (
         <li key={item.filename.toString()}>
           <b className={styles.albumName}>{item.album}</b>
-          <Link href={`/${item.gallery}/${item.album}?select=${item.id}`} title={item.corpus}>
+          <Link href={`/${item.gallery}/${item.album}?select=${Array.isArray(item.filename) ? item.filename[0] : item.filename}`} title={item.corpus}>
             {!showThumbnail(keyword) && item.caption}
             {showThumbnail(keyword) && <Img src={item.thumbPath} alt={item.caption} title={item.corpus} width={width} height={height} />}
           </Link>
diff --git a/src/components/Persons/PersonsClient.tsx b/src/components/Persons/PersonsClient.tsx
index 46368af3..f58cf65b 100644
--- a/src/components/Persons/PersonsClient.tsx
+++ b/src/components/Persons/PersonsClient.tsx
@@ -1,6 +1,7 @@
 'use client'
 
-import { useMemo } from 'react'
+import { useMemo, useEffect } from 'react'
+import { useSearchParams } from 'next/navigation'
 
 import config from '../../../src/models/config'
 import usePersonsFilter from '../../hooks/usePersonsFilter'
@@ -25,6 +26,8 @@ export default function PersonsClient({
     mapFilterEnabled,
     handleToggleMapFilter,
     handleBoundsChange,
+    isClearing,
+    clearCoordinates,
     controls,
     ageFiltered,
     itemsWithCorpus,
@@ -32,6 +35,29 @@ export default function PersonsClient({
     overrideAgeSummary,
   } = usePersonsFilter({ items, indexedKeywords, initialAgeSummary })
 
+  const searchParams = useSearchParams()
+  const selectId = searchParams.get('select')
+
+  // Handle URL ?select= parameter
+  useEffect(() => {
+    if (!selectId || ageFiltered.length === 0) return
+
+    const idx = ageFiltered.findIndex(i => {
+      const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+      return filename === selectId
+    })
+
+    if (idx >= 0) {
+      setTimeout(() => {
+        if (refImageGallery.current?.getCurrentIndex?.() !== idx) {
+          refImageGallery.current?.slideToIndex(idx)
+          setMemoryIndex(idx)
+          setViewed(idx)
+        }
+      }, 0)
+    }
+  }, [selectId, ageFiltered, refImageGallery, setMemoryIndex, setViewed])
+
   // Replace controls age list if override available
   const finalControls = overrideAgeSummary ?? controls
 
@@ -51,6 +77,8 @@ export default function PersonsClient({
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
+          isClearing={isClearing}
+          clearCoordinates={clearCoordinates}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/SlippyMap/index.tsx b/src/components/SlippyMap/index.tsx
index 67cdcd58..f1626173 100644
--- a/src/components/SlippyMap/index.tsx
+++ b/src/components/SlippyMap/index.tsx
@@ -28,6 +28,7 @@ import {
   unclusterLabelLayer,
   unclusterPointLayer,
 } from './layers'
+import styles from './styles.module.css'
 import { getResolutionForZoom, transformMapOptions, transformSourceOptions } from './options'
 import type { ClusteredMarkers } from '../../lib/generate-clusters'
 
@@ -128,17 +129,6 @@ export default function SlippyMap({
   if (unclusterPointLayer.id) layerIds.push(unclusterPointLayer.id)
   if (unclusterLabelLayer.id) layerIds.push(unclusterLabelLayer.id)
 
-  const toggleStyle: React.CSSProperties = {
-    position: 'absolute',
-    top: 8,
-    right: 8,
-    zIndex: 10,
-    background: 'rgba(255,255,255,0.9)',
-    borderRadius: 6,
-    padding: 6,
-    cursor: 'pointer',
-  }
-
   // Helper to read current bounds immediately
   const readBounds = (): [[number, number],[number, number]] | null => {
     try {
@@ -189,19 +179,16 @@ export default function SlippyMap({
 
   return (
     <>
-      <style global jsx>{'.mapboxgl-control-container{display:none;}'}</style>
       <div style={{ position: 'relative', width: '100%', height: '100%', minHeight: 300 }}>
-        <div
-          style={toggleStyle}
-          role="button"
+        <button
+          type="button"
+          className={styles.toggleButton}
           onClick={handleToggleClick}
           aria-pressed={mapFilterEnabled}
           title="Toggle map filter"
         >
-          <span style={{ fontSize: 12, fontWeight: 600 }}>
-            {mapFilterEnabled ? 'Map filter: ON' : 'Map filter: OFF'}
-          </span>
-        </div>
+          {mapFilterEnabled ? 'Map filter: ON' : 'Map filter: OFF'}
+        </button>
         <Map
           {...viewport}
           ref={mapRef}
diff --git a/src/components/SlippyMap/options.ts b/src/components/SlippyMap/options.ts
index 813449eb..4b897879 100644
--- a/src/components/SlippyMap/options.ts
+++ b/src/components/SlippyMap/options.ts
@@ -76,7 +76,7 @@ export function transformSourceOptions(
     const { latitude: selectedLatitude, longitude: selectedLongitude } = validatePoint(selected.coordinates)
 
     const baseKey = getCachedH3Index(item)
-    const commonLabel = baseKey && computed.labels[baseKey]?.[resolution] || getLabelForResolution(item, resolution)
+    const commonLabel = (baseKey && computed.labels[baseKey]?.[resolution]) || getLabelForResolution(item, resolution)
     const individualLabel = getLabelForResolution(item, resolution)
 
     const point: SelectedFeature = {
diff --git a/src/components/SlippyMap/styles.module.css b/src/components/SlippyMap/styles.module.css
new file mode 100644
index 00000000..b595c286
--- /dev/null
+++ b/src/components/SlippyMap/styles.module.css
@@ -0,0 +1,34 @@
+.toggleButton {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  z-index: 10;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 6px;
+  padding: 6px 10px;
+  cursor: pointer;
+  border: none;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: background-color 0.2s ease, transform 0.1s ease;
+  color: #333; /* Dark text for light background */
+  font-family: inherit;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.toggleButton:hover {
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+.toggleButton:active {
+  transform: translateY(1px);
+}
+
+.toggleButton:focus-visible {
+  outline: 2px solid #007bff;
+  outline-offset: 2px;
+}
diff --git a/src/components/SplitViewer/index.tsx b/src/components/SplitViewer/index.tsx
index 00a4575d..780fef83 100644
--- a/src/components/SplitViewer/index.tsx
+++ b/src/components/SplitViewer/index.tsx
@@ -68,6 +68,8 @@ function SplitViewer({
   memoryIndex,
   setMemoryIndex,
   mapFilterEnabled,
+  isClearing,
+  clearCoordinates,
   onToggleMapFilter,
   onMapBoundsChange,
 }: {
@@ -78,6 +80,8 @@ function SplitViewer({
   memoryIndex: number;
   setMemoryIndex: (n: number) => void;
   mapFilterEnabled?: boolean;
+  isClearing?: boolean;
+  clearCoordinates?: [number, number] | null;
   onToggleMapFilter?: () => void;
   onMapBoundsChange?: (bounds: [[number, number],[number, number]]) => void;
 }) {
@@ -113,15 +117,28 @@ function SplitViewer({
   // Dynamic centroid (always reflects current selected item)
   const dynamicCentroid = (safeIndex === -1 || items.length === 0) ? null : items[safeIndex]
 
-  // Locked centroid used while map filter is ON (prevents panning / zooming with next/prev)
+  // Locked centroid used while map filter is ON or during clear
   const [lockedCentroid, setLockedCentroid] = useState<typeof dynamicCentroid>(dynamicCentroid)
 
-  // Update the locked centroid only when map filter is OFF (so user navigation recenters map)
+  // Lock centroid when clear starts with preserved coordinates
   useEffect(() => {
-    if (!mapFilterEnabled) {
+    if (isClearing && clearCoordinates && dynamicCentroid) {
+      setLockedCentroid({
+        ...dynamicCentroid,
+        coordinates: clearCoordinates,
+      } as Item)
+    }
+  }, [isClearing, clearCoordinates, dynamicCentroid])
+
+  // Update locked centroid during normal navigation only
+  useEffect(() => {
+    if (!mapFilterEnabled && !isClearing && dynamicCentroid) {
       setLockedCentroid(dynamicCentroid)
     }
-  }, [mapFilterEnabled, dynamicCentroid])
+  }, [mapFilterEnabled, isClearing, dynamicCentroid])
+
+  // Always use locked centroid during filter or clear, dynamic otherwise
+  const effectiveCentroid = (mapFilterEnabled || isClearing) ? lockedCentroid : dynamicCentroid
 
   // Only pass startIndex on first mount; afterward let the gallery manage its own state
   const initialIndexRef = useRef(safeIndex)
@@ -181,8 +198,7 @@ function SplitViewer({
             mapRef={mapRef}
             clusteredMarkers={clusteredMarkers}
             items={items}
-            // If filter ON: keep using locked centroid (no pan). If OFF: follow selection.
-            centroid={mapFilterEnabled ? lockedCentroid : dynamicCentroid}
+            centroid={effectiveCentroid}
             mapFilterEnabled={mapFilterEnabled}
             onToggleMapFilter={onToggleMapFilter}
             onBoundsChange={onMapBoundsChange}
diff --git a/src/components/ThumbImg/index.tsx b/src/components/ThumbImg/index.tsx
index 26c7d0a8..3f03ce3b 100644
--- a/src/components/ThumbImg/index.tsx
+++ b/src/components/ThumbImg/index.tsx
@@ -4,9 +4,9 @@ import config from '../../../src/models/config'
 import Img from '../Img'
 import styles from './styles.module.css'
 
-function getViewed(viewed: boolean) {
+function getViewed(viewed: boolean, multiSelected: boolean) {
   if (viewed) {
-    return `${styles.highlight} ${styles.imgButton}`
+    return `${multiSelected ? styles.highlightMulti : styles.highlight} ${styles.imgButton}`
   }
   return styles.imgButton
 }
@@ -18,13 +18,15 @@ function ThumbImg({
   src,
   id,
   viewed: globalViewed = false,
+  multiSelected = false,
 }: {
-  onClick?: () => void;
+  onClick?: (event: MouseEvent<HTMLAnchorElement | HTMLUListElement>) => void;
   caption: string;
   href?: string;
   src: string;
   id: string;
   viewed: boolean;
+  multiSelected?: boolean;
 }) {
   // Keep visuals (local state for immediate feedback) but never reset globally
   const [viewed, setViewed] = useState(globalViewed)
@@ -36,14 +38,14 @@ function ThumbImg({
   const handleClick = (event: MouseEvent<HTMLAnchorElement | HTMLUListElement>) => {
     event.preventDefault()
     if (!viewed) setViewed(true)
-    onClick?.()
+    onClick?.(event)
   }
 
   const { width, height } = config.resizeDimensions.thumb
 
   return (
     <li className={styles.bullet}>
-      <a className={getViewed(globalViewed || viewed)} href={href} onClick={handleClick} id={id}>
+      <a className={getViewed(globalViewed || viewed, multiSelected)} href={href} onClick={handleClick} id={id}>
         <Img
           src={src}
           alt={caption}
diff --git a/src/components/ThumbImg/styles.module.css b/src/components/ThumbImg/styles.module.css
index 4593717d..9f1b2ce4 100644
--- a/src/components/ThumbImg/styles.module.css
+++ b/src/components/ThumbImg/styles.module.css
@@ -25,3 +25,6 @@
 .highlight {
   border-color: white;
 }
+.highlightMulti {
+  border-color: #d9c24a;
+}
diff --git a/src/hooks/__tests__/useMemoryAndMapFilter.test.tsx b/src/hooks/__tests__/useMemoryAndMapFilter.test.tsx
index c5298a43..9803f22a 100644
--- a/src/hooks/__tests__/useMemoryAndMapFilter.test.tsx
+++ b/src/hooks/__tests__/useMemoryAndMapFilter.test.tsx
@@ -10,6 +10,7 @@ jest.mock('../useSearch', () => ({
     keyword: '',
     searchBox: <div data-testid="search-box" />,
     setVisibleCount: jest.fn(),
+    setDisplayedItems: jest.fn(),
   }),
 }))
 
diff --git a/src/hooks/__tests__/useSearch.vitest.tsx b/src/hooks/__tests__/useSearch.vitest.tsx
index ad77e406..a373fec4 100644
--- a/src/hooks/__tests__/useSearch.vitest.tsx
+++ b/src/hooks/__tests__/useSearch.vitest.tsx
@@ -152,7 +152,7 @@ describe('Router ready', () => {
       { corpus: 'orange juice and grapes' },
       { corpus: 'cherry tart dessert' },
     ]
-    
+
     const { result, rerender } = renderHook(() => useSearch({ items, indexedKeywords: [] }))
 
     // Initial state: only 1 item matches "apple banana"
@@ -269,7 +269,11 @@ describe('Clear button functionality', () => {
 
     vi.mocked(usePathname).mockReturnValue('/search')
 
-    const items = [{ corpus: 'apple' }, { corpus: 'banana' }, { corpus: 'cherry' }]
+    const items = [
+      { corpus: 'apple', filename: 'apple.jpg' },
+      { corpus: 'banana', filename: 'banana.jpg' },
+      { corpus: 'cherry', filename: 'cherry.jpg' },
+    ]
 
     // Use a wrapper component to access the hook
     function TestComponent() {
@@ -283,7 +287,7 @@ describe('Clear button functionality', () => {
     expect(container.textContent).toMatch(/for "apple"/)
 
     // Find the Clear button by title attribute
-    const clearButton = container.querySelector('button[title="Clear search"]') as HTMLButtonElement
+    const clearButton = container.querySelector('button[title="Clear search and view adjacent photos"]') as HTMLButtonElement
 
     // Mock the search params to return empty after clearing
     vi.mocked(useSearchParams).mockReturnValue({
@@ -293,7 +297,7 @@ describe('Clear button functionality', () => {
     fireEvent.click(clearButton)
 
     // Verify router.replace was called
-    expect(mockReplace).toHaveBeenCalledWith('/search')
+    expect(mockReplace).toHaveBeenCalledWith('/search?select=apple.jpg')
 
     // Check that the input field value is cleared
     await waitFor(() => {
@@ -323,21 +327,22 @@ describe('Clear button functionality', () => {
     vi.mocked(usePathname).mockReturnValue('/gallery/photos')
 
     const items = [
-      { corpus: 'apple' },
-      { corpus: 'banana' },
-      { corpus: 'cherry' },
-      { corpus: 'banana split' },
+      { corpus: 'apple', filename: 'apple.jpg' },
+      { corpus: 'banana', filename: 'banana.jpg' },
+      { corpus: 'cherry', filename: 'cherry.jpg' },
+      { corpus: 'banana split', filename: 'banana-split.jpg' },
     ]
 
     // Use a wrapper component to access the hook and set visible count
     function TestComponent() {
       const search = useSearch({ items, indexedKeywords: [] })
 
-      // Simulate setting visible count based on filtered results
-      const { filtered, setVisibleCount } = search
+      // Simulate setting visible count and displayed items based on filtered results
+      const { filtered, setVisibleCount, setDisplayedItems } = search
       React.useEffect(() => {
         setVisibleCount(filtered.length)
-      }, [filtered, setVisibleCount])
+        setDisplayedItems(filtered)
+      }, [filtered, setVisibleCount, setDisplayedItems])
 
       return <div>{search.searchBox}</div>
     }
@@ -353,7 +358,7 @@ describe('Clear button functionality', () => {
     expect(container.textContent).toMatch(/for "ban"/)
 
     // Find the Clear button
-    const clearButton = container.querySelector('button[title="Clear search"]') as HTMLButtonElement
+    const clearButton = container.querySelector('button[title="Clear search and view adjacent photos"]') as HTMLButtonElement
 
     // Mock the search params to return empty after clearing
     vi.mocked(useSearchParams).mockReturnValue({
@@ -363,7 +368,7 @@ describe('Clear button functionality', () => {
     fireEvent.click(clearButton)
 
     // Verify URL was cleared (router.replace called with path only, no keyword)
-    expect(mockReplace).toHaveBeenCalledWith('/gallery/photos')
+    expect(mockReplace).toHaveBeenCalledWith('/gallery/photos?select=banana.jpg')
 
     // Re-render to reflect the cleared state
     rerender(<TestComponent />)
diff --git a/src/hooks/useBookmark.tsx b/src/hooks/useBookmark.tsx
new file mode 100644
index 00000000..80861b87
--- /dev/null
+++ b/src/hooks/useBookmark.tsx
@@ -0,0 +1,63 @@
+'use client'
+
+import { Button } from '@mui/joy'
+import { useRouter } from 'next/navigation'
+import type { RefObject } from 'react'
+
+interface UseBookmarkProps<ItemType> {
+  refImageGallery?: RefObject<any>
+  displayedItems: ItemType[]
+  pathname: string
+  currentIndex?: number
+  selectById?: (id: string) => void
+}
+
+export default function useBookmark<ItemType>({
+  refImageGallery,
+  displayedItems,
+  pathname,
+  currentIndex,
+  selectById,
+}: UseBookmarkProps<ItemType>) {
+  const router = useRouter()
+
+  const handleBookmark = () => {
+    // Get current photo ID from displayed items (respects map filter)
+    const galleryIndex = refImageGallery?.current?.getCurrentIndex?.()
+    const indexToUse = typeof galleryIndex === 'number' ? galleryIndex : (currentIndex ?? 0)
+    const currentItem = displayedItems[indexToUse]
+    if (!currentItem) return
+
+    // Use filename as unique identifier (works across all albums)
+    const identifier = Array.isArray((currentItem as any).filename)
+      ? (currentItem as any).filename[0]
+      : (currentItem as any).filename
+    if (!identifier) return
+
+    // Notify parent to track selection (updates memoryIndex to match ID)
+    if (selectById) {
+      selectById(identifier)
+    }
+
+    // Copy bookmark URL to clipboard
+    const bookmarkUrl = `${window.location.origin}${pathname}?select=${identifier}`
+    navigator.clipboard.writeText(bookmarkUrl)
+
+    // Update URL to reflect the selection
+    router.replace(`${pathname}?select=${identifier}`, { scroll: false })
+  }
+
+  const BookmarkButton = () => (
+    <Button
+      type="button"
+      onClick={handleBookmark}
+      color="primary"
+      variant="soft"
+      title="Copy bookmark URL to clipboard"
+    >
+      Bookmark
+    </Button>
+  )
+
+  return { BookmarkButton, handleBookmark }
+}
diff --git a/src/hooks/useMapFilter.ts b/src/hooks/useMapFilter.ts
index c42b849e..6cf9366f 100644
--- a/src/hooks/useMapFilter.ts
+++ b/src/hooks/useMapFilter.ts
@@ -12,6 +12,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
   const [memoryIndex, setMemoryIndexState] = useState(0)
   const resetIndexOnEnableRef = useRef(false) // flag to force index 0 when enabling map filter
   const autoInitialViewRef = useRef(true) // controls useMemory auto mark
+  const [isClearing, setIsClearing] = useState(false) // flag to prevent map updates during clear
 
   const setMemoryIndex: Dispatch<SetStateAction<number>> = useCallback((value) => {
     setMemoryIndexState(prev => {
@@ -20,16 +21,43 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     })
   }, [])
 
+  const [mapFilterEnabled, setMapFilterEnabled] = useState(false)
+  const [mapBounds, setMapBounds] = useState<Bounds | null>(null)
+  const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [clearCoordinates, setClearCoordinates] = useState<[number, number] | null>(null)
+
+  const handleClearMapFilter = useCallback((coordinates?: [number, number] | null) => {
+    // Preserve coordinates before clearing filter
+    if (coordinates) {
+      setClearCoordinates(coordinates)
+    }
+    setIsClearing(true)
+    setMapFilterEnabled(false)
+    setMapBounds(null)
+  }, [])
+
+  const selectById = useCallback((id: string, isClear = false) => {
+    // Simply update selectedId for both clear and normal operations
+    // The URL-based handling in each client will position the gallery
+    setSelectedId(prev => (prev === id ? prev : id))
+  }, [])
+
   const {
     filtered,
     keyword,
     searchBox,
     setVisibleCount,
-  } = useSearch({ items, setMemoryIndex, indexedKeywords })
-
-  const [mapFilterEnabled, setMapFilterEnabled] = useState(false)
-  const [mapBounds, setMapBounds] = useState<Bounds | null>(null)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
+    setDisplayedItems,
+  } = useSearch({
+    items,
+    memoryIndex,
+    setMemoryIndex,
+    indexedKeywords,
+    refImageGallery,
+    mapFilterEnabled,
+    onClearMapFilter: handleClearMapFilter,
+    selectById,
+  })
 
   const handleBoundsChange = useCallback((bounds: Bounds) => {
     if (!bounds) return
@@ -56,6 +84,36 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     })
   }, [mapFilterEnabled, mapBounds, filtered])
 
+  // Memoized ID-to-index maps for O(1) lookups (critical for large datasets)
+  const itemsToShowMap = useMemo(() => {
+    const map = new Map<string, number>()
+    itemsToShow.forEach((item: any, idx) => {
+      // Index by ID
+      if (item.id) map.set(item.id, idx)
+      // Also index by filename (globally unique)
+      const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+      if (filename) map.set(filename, idx)
+    })
+    return map
+  }, [itemsToShow])
+
+  const filteredMap = useMemo(() => {
+    const map = new Map<string, number>()
+    filtered.forEach((item: any, idx) => {
+      // Index by ID
+      if (item.id) map.set(item.id, idx)
+      // Also index by filename (globally unique)
+      const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+      if (filename) map.set(filename, idx)
+    })
+    return map
+  }, [filtered])
+
+  // Update displayed items whenever itemsToShow changes
+  useEffect(() => {
+    setDisplayedItems(itemsToShow)
+  }, [itemsToShow, setDisplayedItems])
+
   // Pass suppression flag to useMemory
   const { setViewed, memoryHtml, viewedList } = useMemory(
     itemsToShow,
@@ -94,31 +152,23 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     }
   }, [mapFilterEnabled, itemsToShow, setViewed])
 
-  const selectById = useCallback((id: string) => {
-    setSelectedId(prev => (prev === id ? prev : id))
-    const idx = itemsToShow.findIndex(i => i.id === id)
-    if (idx >= 0) {
+  // Update memoryIndex when selectedId changes
+  useEffect(() => {
+    if (!selectedId) return
+
+    // Use O(1) map lookup
+    const idx = itemsToShowMap.get(selectedId)
+    if (idx !== undefined) {
       setMemoryIndex(idx)
       return
     }
-    const idx2 = filtered.findIndex(i => i.id === id)
-    if (idx2 >= 0) setMemoryIndex(idx2)
-  }, [itemsToShow, filtered, setMemoryIndex])
 
-  useEffect(() => {
-    if (selectedId) {
-      const idx = itemsToShow.findIndex(i => i.id === selectedId)
-      if (idx >= 0) {
-        setMemoryIndex(idx)
-        return
-      }
+    // Fallback to filtered
+    const idx2 = filteredMap.get(selectedId)
+    if (idx2 !== undefined) {
+      setMemoryIndex(idx2)
     }
-    if (itemsToShow.length === 0) {
-      setMemoryIndex(0)
-    } else if (memoryIndex >= itemsToShow.length) {
-      setMemoryIndex(itemsToShow.length - 1)
-    }
-  }, [itemsToShow, selectedId, memoryIndex, setMemoryIndex])
+  }, [itemsToShowMap, filteredMap, selectedId, setMemoryIndex])
 
   useEffect(() => {
     const timeout = setTimeout(() => {
@@ -127,6 +177,18 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     return () => clearTimeout(timeout)
   }, [itemsToShow.length, setVisibleCount])
 
+  // Clear clearing flag after gallery repositions during clear
+  useEffect(() => {
+    if (isClearing && !mapFilterEnabled) {
+      // Wait for gallery to reposition, then clear flag and coordinates
+      const timeout = setTimeout(() => {
+        setIsClearing(false)
+        setClearCoordinates(null)
+      }, 200)
+      return () => clearTimeout(timeout)
+    }
+  }, [mapFilterEnabled, memoryIndex, isClearing])
+
   return {
     refImageGallery,
     memoryIndex,
@@ -143,5 +205,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     itemsToShow,
     selectedId,
     selectById,
+    isClearing,
+    clearCoordinates,
   }
 }
diff --git a/src/hooks/useMemory.tsx b/src/hooks/useMemory.tsx
index 30e72d53..dc8dd88b 100644
--- a/src/hooks/useMemory.tsx
+++ b/src/hooks/useMemory.tsx
@@ -50,7 +50,7 @@ const useMemory = (
   }, [filtered, refImageGallery, autoInitialView])
 
   const memoryHtml = details ? (
-    <>
+    <div data-type="memory-details">
       <h3 className={styles.city}>{details.title}</h3>
       {details.persons && (
         <h4 className={styles.person}>
@@ -61,11 +61,11 @@ const useMemory = (
         {Array.isArray(details.filename) ? details.filename.join(', ') : String(details.filename)}
       </h5>
       {details.reference && details.reference.length >= 2 && (
-        <Link href={details.reference[0]}>
+        <Link href={details.reference[0]} target='_blank' rel="noopener noreferrer">
           {decodeURI(details.reference[1]).replaceAll('_', ' ')}
         </Link>
       )}
-    </>
+    </div>
   ) : null
 
   return { setViewed, memoryHtml, viewedList }
diff --git a/src/hooks/usePersonsFilter.tsx b/src/hooks/usePersonsFilter.tsx
index fcfa23a0..3818c410 100644
--- a/src/hooks/usePersonsFilter.tsx
+++ b/src/hooks/usePersonsFilter.tsx
@@ -41,6 +41,8 @@ export default function usePersonsFilter({
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
+    isClearing,
+    clearCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
   // Age/person selection state
@@ -219,6 +221,8 @@ export default function usePersonsFilter({
     mapFilterEnabled,
     handleToggleMapFilter,
     handleBoundsChange,
+    isClearing,
+    clearCoordinates,
     // age/person
     selectedAge,
     setSelectedAge,
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index 586c8fbb..09c8ce91 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -9,6 +9,8 @@ import {
 } from 'react'
 import AutoComplete from '../components/ComboBox'
 import { IndexedKeywords } from '../types/common'
+import useBookmark from './useBookmark'
+import { matchCorpus } from '../utils/search'
 import styles from './search.module.css'
 
 interface ServerSideItem {
@@ -17,14 +19,24 @@ interface ServerSideItem {
 
 interface UseSearchProps<ItemType> {
   items: ItemType[];
+  memoryIndex?: number;
   setMemoryIndex?: Dispatch<SetStateAction<number>>;
   indexedKeywords?: IndexedKeywords[];
+  refImageGallery?: React.RefObject<any>;
+  mapFilterEnabled?: boolean;
+  onClearMapFilter?: (coordinates?: [number, number] | null) => void;
+  selectById?: (id: string, isClear?: boolean) => void;
 }
 
 export default function useSearch<ItemType extends ServerSideItem>({
   items,
+  memoryIndex,
   setMemoryIndex,
   indexedKeywords = [],
+  refImageGallery,
+  mapFilterEnabled,
+  onClearMapFilter,
+  selectById,
 }: UseSearchProps<ItemType>) {
   const searchParams = useSearchParams()
   const router = useRouter()
@@ -36,134 +48,71 @@ export default function useSearch<ItemType extends ServerSideItem>({
     initialKeyword ? { label: initialKeyword, value: initialKeyword } : null,
   )
   const [inputValue, setInputValue] = useState<string>(initialKeyword)
-  const [filteredItems, setFilteredItems] = useState<ItemType[]>(items)
+  const [displayedItems, setDisplayedItems] = useState<ItemType[]>(items)
+
+  const filtered = useMemo(() => {
+    if (!keyword) return items
+    return items.filter((item) => matchCorpus(item.corpus, keyword))
+  }, [items, keyword])
 
   // Count of currently visible thumbnails (consumer can override this if needed)
-  const [visibleCount, setVisibleCount] = useState<number>(items.length)
+  const [visibleCount, setVisibleCount] = useState<number>(filtered.length)
 
   // Make setVisibleCount stable to prevent useEffect loops
   const setVisibleCountStable = useCallback((count: number) => {
     setVisibleCount((prev) => (prev === count ? prev : count))
   }, [])
 
-  const AND_OPERATOR = '&&'
-  const OR_OPERATOR = '||'
-
-  const normalize = (text: string) =>
-    text
-      .normalize('NFD')
-      .replace(/[\u0300-\u036f]/g, '')
-      .toLowerCase()
-
-  /**
-   * Matches a search keyword against a corpus string using boolean operators.
-   * Supports AND (&&) and OR (||) operators with single-level parentheses.
-   *
-   * Simple searches (words separated by spaces) are treated as implicit AND operations.
-   * For example, "apple banana" matches text containing both "apple" AND "banana".
-   *
-   * Limitation: Nested parentheses are NOT supported. Expressions like `((a || b) && c)`
-   * or `(a && (b || c))` will not be evaluated correctly. Only simple single-level
-   * parentheses work: `(a || b) && c` or `a && (b || c)`.
-   *
-   * @param {string} corpus - The text to search within
-   * @param {string} kword - The search keyword with optional boolean operators (&&, ||) and parentheses
-   * @returns {boolean} True if the keyword matches the corpus
-   *
-   * @example
-   * ```ts
-   * matchCorpus('apple banana', 'apple banana') // true (implicit AND)
-   * matchCorpus('apple banana', 'apple && banana') // true
-   * matchCorpus('orange banana', 'apple || orange') // true
-   * matchCorpus('apple banana', '(apple || orange) && banana') // true
-   * matchCorpus('text', '((a || b) && c)') // NOT SUPPORTED - will not work correctly
-   * ```
-   */
-  const matchCorpus = (corpus: string, kword: string): boolean => {
-    const normalizedCorpus = normalize(corpus)
-    const normalizedKeyword = normalize(kword)
-
-    const evaluateExpression = (expr: string): boolean => {
-      // If there's no AND or OR operator, treat spaces as implicit AND
-      if (!expr.includes(AND_OPERATOR) && !expr.includes(OR_OPERATOR)) {
-        const terms = expr.split(/\s+/).filter(t => t.length > 0)
-        return terms.every((term) => normalizedCorpus.includes(term.trim()))
-      }
-
-      // If there's no AND operator, evaluate as OR expression
-      if (!expr.includes(AND_OPERATOR)) {
-        return expr
-          .split(OR_OPERATOR)
-          .some((term) => normalizedCorpus.includes(term.trim()))
-      }
-
-      // Split by AND carefully, preserving content inside parentheses
-      const andParts: string[] = []
-      let currentPart = ''
-      let depth = 0
-
-      for (let i = 0; i < expr.length; i++) {
-        const char = expr[i]
-        const nextChar = expr[i + 1]
-
-        if (char === '(') depth++
-        if (char === ')') depth--
-
-        // Check for && outside of parentheses
-        if (char === '&' && nextChar === '&' && depth === 0) {
-          andParts.push(currentPart.trim())
-          currentPart = ''
-          i++ // skip the second &
-          continue
-        }
-
-        currentPart += char
-      }
-      if (currentPart.trim()) {
-        andParts.push(currentPart.trim())
-      }
-
-      return andParts.every((part) => {
-        // Check if this part has parentheses
-        const parenMatch = part.match(/^\((.*)\)$/)
-        if (parenMatch) {
-          // Evaluate the OR expression inside parentheses
-          // TODO: This only handles simple OR expressions, not nested AND/OR combinations
-          // For full support, recursively call evaluateExpression(parenMatch[1])
-          const innerExpr = parenMatch[1]
-          return innerExpr
-            .split(OR_OPERATOR)
-            .some((term) => normalizedCorpus.includes(term.trim()))
-        }
-
-        // Regular term - check if corpus contains it
-        return normalizedCorpus.includes(part)
-      })
-    }
-
-    return evaluateExpression(normalizedKeyword)
-  }
-
-  const filtered = useMemo(() => {
-    if (!keyword) return items
-    return items.filter((item) => matchCorpus(item.corpus, keyword))
-  }, [items, keyword])
+  // Sync visibleCount when filtered items change (avoids state-update-during-render)
+  useEffect(() => {
+    setVisibleCount((prev) => (prev === filtered.length ? prev : filtered.length))
+  }, [filtered.length])
 
-  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+  const handleSubmit = useCallback((event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
     const newKeyword = selectedOption?.value ?? ''
     setKeyword(newKeyword)
     setMemoryIndex?.(0)
     router.push(`${pathname}?keyword=${encodeURIComponent(newKeyword)}`)
-  }
+  }, [selectedOption, setMemoryIndex, router, pathname])
+
+  const handleClear = useCallback(() => {
+    // Get current photo ID from displayed items (respects map filter)
+    const currentIndex = refImageGallery?.current?.getCurrentIndex?.() ?? 0
+    const itemsToUse = displayedItems || filtered
+    const currentItem = itemsToUse[currentIndex]
+    const identifier = currentItem
+      ? (Array.isArray((currentItem as any).filename)
+          ? (currentItem as any).filename[0]
+          : (currentItem as any).filename)
+      : null
+    const coordinates = (currentItem as any)?.coordinates as [number, number] | null
+
+    if (selectById && identifier) {
+      selectById(identifier, true)
+    }
 
-  const handleClear = () => {
+    // Clear search state
     setKeyword('')
     setSelectedOption(null)
     setInputValue('')
-    setMemoryIndex?.(0)
-    router.replace(pathname)
-  }
+
+    // Clear map filter - pass coordinates to preserve map position
+    if (mapFilterEnabled && onClearMapFilter) {
+      onClearMapFilter(coordinates)
+    }
+
+    // Update URL to reflect the selection (use filename for global uniqueness)
+    router.replace(identifier ? `${pathname}?select=${identifier}` : pathname)
+  }, [refImageGallery, displayedItems, filtered, selectById, mapFilterEnabled, onClearMapFilter, router, pathname])
+
+  const { BookmarkButton } = useBookmark({
+    refImageGallery,
+    displayedItems: displayedItems || filtered,
+    pathname,
+    currentIndex: memoryIndex,
+    selectById,
+  })
 
   const keywordResultLabel = keyword ? <> for &quot;{keyword}&quot;</> : null
 
@@ -189,17 +138,18 @@ export default function useSearch<ItemType extends ServerSideItem>({
         >
           Filter
         </Button>
-        {keyword && (
+        {(mapFilterEnabled || keyword) && (
           <Button
             type="button"
             onClick={handleClear}
             color="primary"
             variant="soft"
-            title="Clear search"
+            title="Clear search and view adjacent photos"
           >
             Clear
           </Button>
         )}
+        <BookmarkButton />
       </div>
     </form>
   )
@@ -217,18 +167,12 @@ export default function useSearch<ItemType extends ServerSideItem>({
     }
   }, [searchParams])
 
-  useEffect(() => {
-    setFilteredItems(filtered)
-    // Automatically update visible count when filtered results change
-    setVisibleCount(filtered.length)
-  }, [filtered])
-
   return {
     filtered,
     keyword,
     setKeyword,
     searchBox,
     setVisibleCount: setVisibleCountStable,
-    setFiltered: setFilteredItems,
+    setDisplayedItems,
   }
 }
diff --git a/src/lib/all.ts b/src/lib/all.ts
index 6632a807..6416422f 100644
--- a/src/lib/all.ts
+++ b/src/lib/all.ts
@@ -1,62 +1,6 @@
-import getAlbum from '../lib/album'
-import getAlbums from '../lib/albums'
-import indexKeywords, { addGeographyToSearch } from '../lib/search'
-import config from '../models/config'
-import type { AlbumMeta, Item, ServerSideAllItem } from '../types/common'
+import { getAllItems, allPageItemMapper } from './get-all-items'
 import type { All } from '../types/pages'
 
 export async function getAllData({ gallery }: All.Params): Promise<All.ItemData> {
-  const { [gallery]: { albums } } = await getAlbums(gallery)
-
-  const prepareItems = (
-    { albumName, albumCoordinateAccuracy, items }:
-    { albumName: AlbumMeta['albumName']; albumCoordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom']; items: Item[] },
-  ) => items.map((item) => {
-    const filenameStr = Array.isArray(item.filename) ? (item.filename[0] ?? '') : (item.filename ?? '')
-    const titleStr = Array.isArray(item.title) ? (item.title[0] ?? '') : (item.title ?? '')
-    const searchStr = addGeographyToSearch(item) ?? ''
-    const corpus = [
-      item.description ?? '',
-      item.caption ?? '',
-      item.location ?? '',
-      item.city ?? '',
-      searchStr,
-    ].join(' ').trim()
-
-    return {
-      id: item.id,
-      filename: filenameStr,
-      photoDate: item.photoDate,
-      city: item.city,
-      location: item.location,
-      description: item.description,
-      caption: item.caption,
-      persons: item.persons,
-      coordinates: item.coordinates,
-      coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
-      thumbPath: item.thumbPath,
-      photoPath: item.photoPath,
-      mediaPath: item.mediaPath,
-      reference: null,
-      videoPaths: null,
-      gallery,
-      album: albumName,
-      title: titleStr,
-      corpus,
-      search: searchStr,
-    }
-  })
-
-  const allItems = (await albums.reduce(async (prevP, album) => {
-    const prev = await prevP
-    const { album: { items, meta } } = await getAlbum(gallery, album.name)
-    const albumCoordinateAccuracy = meta?.geo?.zoom ?? config.defaultZoom
-    const preparedItems = prepareItems({ albumName: album.name, albumCoordinateAccuracy, items })
-    return prev.concat(preparedItems.reverse())
-  }, Promise.resolve([] as ServerSideAllItem[]))).reverse()
-
-  // indexKeywords will run on slim items; keep keyword index small too
-  const { indexedKeywords } = indexKeywords(allItems)
-
-  return { items: allItems, indexedKeywords }
+  return getAllItems(gallery, allPageItemMapper, true)
 }
diff --git a/src/lib/generate-clusters.ts b/src/lib/generate-clusters.ts
index 0ade1444..2636ef52 100644
--- a/src/lib/generate-clusters.ts
+++ b/src/lib/generate-clusters.ts
@@ -72,11 +72,9 @@ export function generateClusters(items: Item[]): ClusteredMarkers {
     if (isInvalid) return it
 
     const h3Cache: Record<number, string> = {}
-    h3Cache[BASE_H3_RESOLUTION] = getH3Index(lat, lng, BASE_H3_RESOLUTION)
-    for (const h3Res of Object.values(RESOLUTION_TO_H3)) {
-      if (!h3Cache[h3Res]) {
-        h3Cache[h3Res] = getH3Index(lat, lng, h3Res)
-      }
+    const uniqueResolutions = new Set(Object.values(RESOLUTION_TO_H3))
+    for (const h3Res of uniqueResolutions) {
+      h3Cache[h3Res] = getH3Index(lat, lng, h3Res)
     }
     return { ...it, h3Cache }
   })
diff --git a/src/lib/get-all-items.ts b/src/lib/get-all-items.ts
new file mode 100644
index 00000000..e28fd5eb
--- /dev/null
+++ b/src/lib/get-all-items.ts
@@ -0,0 +1,134 @@
+import getAlbum from '../lib/album'
+import getAlbums from '../lib/albums'
+import getGalleries from '../lib/galleries'
+import indexKeywords, { addGeographyToSearch } from '../lib/search'
+import config from '../models/config'
+import type { AlbumMeta, Gallery, Item, ServerSideAllItem } from '../types/common'
+import type { All } from '../types/pages'
+
+type PrepareItemsParams = {
+  albumName: AlbumMeta['albumName']
+  albumCoordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom']
+  items: Item[]
+  gallery: Gallery
+}
+
+type ItemMapper = (params: PrepareItemsParams) => ServerSideAllItem[]
+
+/**
+ * Shared utility to get all items from albums with indexed keywords
+ * @param {Gallery} gallery Gallery name
+ * @param {ItemMapper} itemMapper Custom function to map items to ServerSideAllItem format
+ * @param {boolean} reverseAlbumItems Whether to reverse items within each album
+ * @returns {Promise<All.ItemData>} Items and indexed keywords
+ */
+export async function getAllItems(
+  gallery: Gallery,
+  itemMapper: ItemMapper,
+  reverseAlbumItems = false,
+): Promise<All.ItemData> {
+  const { [gallery]: { albums } } = await getAlbums(gallery)
+
+  const allItems = (await albums.reduce(async (prevP, album) => {
+    const prev = await prevP
+    const { album: { items, meta } } = await getAlbum(gallery, album.name)
+    const albumCoordinateAccuracy = meta?.geo?.zoom ?? config.defaultZoom
+    const preparedItems = itemMapper({
+      albumName: album.name,
+      albumCoordinateAccuracy,
+      items,
+      gallery,
+    })
+    const itemsToConcat = reverseAlbumItems ? preparedItems.reverse() : preparedItems
+    return prev.concat(itemsToConcat)
+  }, Promise.resolve([] as ServerSideAllItem[]))).reverse()
+
+  const { indexedKeywords } = indexKeywords(allItems)
+
+  return { items: allItems, indexedKeywords }
+}
+
+/**
+ * Item mapper for /all page - creates detailed items with all fields
+ */
+export function allPageItemMapper({ albumName, albumCoordinateAccuracy, items, gallery }: PrepareItemsParams): ServerSideAllItem[] {
+  return items.map((item) => {
+    const filenameStr = Array.isArray(item.filename) ? (item.filename[0] ?? '') : (item.filename ?? '')
+    const titleStr = Array.isArray(item.title) ? (item.title[0] ?? '') : (item.title ?? '')
+    const searchStr = addGeographyToSearch(item) ?? ''
+    const corpus = [
+      item.description ?? '',
+      item.caption ?? '',
+      item.location ?? '',
+      item.city ?? '',
+      searchStr,
+    ].join(' ').trim()
+
+    return {
+      id: item.id,
+      filename: filenameStr,
+      photoDate: item.photoDate,
+      city: item.city,
+      location: item.location,
+      description: item.description,
+      caption: item.caption,
+      persons: item.persons,
+      coordinates: item.coordinates,
+      coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
+      thumbPath: item.thumbPath,
+      photoPath: item.photoPath,
+      mediaPath: item.mediaPath,
+      reference: null,
+      videoPaths: null,
+      gallery,
+      album: albumName,
+      title: titleStr,
+      corpus,
+      search: searchStr,
+    }
+  })
+}
+
+/**
+ * Item mapper for /persons page - uses spread operator for simpler mapping
+ */
+export function personsPageItemMapper({ albumName, albumCoordinateAccuracy, items, gallery }: PrepareItemsParams): ServerSideAllItem[] {
+  return items.map((item) => ({
+    ...item,
+    gallery,
+    album: albumName,
+    corpus: [item.description, item.caption, item.location, item.city, item.search].join(' '),
+    coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
+    search: addGeographyToSearch(item),
+  }))
+}
+
+/**
+ * Get all keywords from all galleries and albums
+ * @returns {Promise<{ indexedKeywords: ReturnType<typeof indexKeywords>['indexedKeywords'] }>} Indexed keywords with counts
+ */
+export async function getAllKeywords(): Promise<{ indexedKeywords: ReturnType<typeof indexKeywords>['indexedKeywords'] }> {
+  const { galleries } = await getGalleries()
+  const allItems: { search: Item['search'] }[] = []
+
+  // Collect search keywords from all galleries
+  for (const gallery of galleries) {
+    const { [gallery]: { albums } } = await getAlbums(gallery)
+
+    for (const album of albums) {
+      try {
+        const { album: { items } } = await getAlbum(gallery, album.name)
+        items.forEach((item) => {
+          if (item.search) {
+            allItems.push({ search: item.search })
+          }
+        })
+      } catch (error) {
+        console.error(`Failed to read album ${album.name} in gallery ${gallery}:`, error)
+      }
+    }
+  }
+
+  const { indexedKeywords } = indexKeywords(allItems)
+  return { indexedKeywords }
+}
diff --git a/src/lib/paths.ts b/src/lib/paths.ts
new file mode 100644
index 00000000..f51d7744
--- /dev/null
+++ b/src/lib/paths.ts
@@ -0,0 +1,54 @@
+import type { Gallery, Item, XmlItem } from '../types/common'
+
+const filenameAsJpg = (filename: Item['filename'][0]) => {
+  const lastDot = filename.lastIndexOf('.')
+  if (lastDot === -1) return `${filename}.jpg`
+  const base = filename.slice(0, lastDot)
+  const currentExt = filename.slice(lastDot + 1)
+  const futureExt = (currentExt.toLowerCase() === 'jpg' || currentExt.toLowerCase() === 'jpeg') ? currentExt : 'jpg'
+  return `${base}.${futureExt}`
+}
+
+/**
+ * Photo or thumbnail path to public folder on local filesystem
+ * @param {object} filename file plus extension
+ * @param {string} gallery name
+ * @param {string} rasterType photo|thumb
+ * @returns {string} path
+ */
+export const rasterPath = (filename: XmlItem['filename'], gallery: Gallery, rasterType: 'original' | 'photo' | 'thumb') => {
+  const imageFilename = filenameAsJpg(Array.isArray(filename) ? filename[0] : filename)
+  const year = imageFilename.indexOf('-') >= 0 ? imageFilename.split('-')[0] : ''
+
+  return `/galleries/${gallery}/media/${rasterType}s/${year}/${imageFilename}`
+}
+
+/**
+ * Thumbnail path to public folder
+ */
+export const thumbPath = (filename: XmlItem['filename'], gallery: Gallery) => rasterPath(filename, gallery, 'thumb')
+
+/**
+ * Photo path to public folder (resized for display)
+ */
+export const photoPath = (filename: XmlItem['filename'], gallery: Gallery) => rasterPath(filename, gallery, 'photo')
+
+/**
+ * Original (full-size) image path to public folder
+ */
+export const originalPath = (filename: XmlItem['filename'], gallery: Gallery) => rasterPath(filename, gallery, 'original')
+
+/**
+ * Video paths to public folder on local filesystem
+ * @param {object} filename file plus extension
+ * @param {string} gallery name
+ * @returns {string[]} path
+ */
+export const getVideoPaths = (filename: XmlItem['filename'], gallery: Gallery) => {
+  const filenames = Array.isArray(filename) ? filename : [filename]
+
+  return filenames.map(fn => {
+    const year = fn.indexOf('-') >= 0 ? fn.split('-')[0] : ''
+    return `/galleries/${gallery}/media/videos/${year}/${fn}`
+  })
+}
diff --git a/src/lib/persons.ts b/src/lib/persons.ts
index 07500fda..e75192a6 100644
--- a/src/lib/persons.ts
+++ b/src/lib/persons.ts
@@ -1,9 +1,6 @@
-import getAlbum from '../lib/album'
-import getAlbums from '../lib/albums'
-import indexKeywords, { addGeographyToSearch } from '../lib/search'
-import config from '../models/config'
+import { getAllItems, personsPageItemMapper } from './get-all-items'
 import transformJsonSchema, { errorSchema, type ErrorOptionalMessage } from '../models/person'
-import type { AlbumMeta, Gallery, Item, Person, ServerSideAllItem } from '../types/common'
+import type { Gallery, Person } from '../types/common'
 import type { All } from '../types/pages'
 import { handleLibraryError } from './utils'
 import { readPersons } from './xml'
@@ -46,40 +43,7 @@ async function get(
 }
 
 export async function getPersonsData({ gallery }: All.Params): Promise<All.ItemData> {
-  const { [gallery]: { albums } } = await getAlbums(gallery)
-
-  const prepareItems = (
-    { albumName, albumCoordinateAccuracy, items }:
-    {
-      albumName: AlbumMeta['albumName'],
-      albumCoordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom'],
-      items: Item[],
-    },
-  ) => items.map((item) => ({
-    ...item,
-    gallery,
-    album: albumName,
-    corpus: [item.description, item.caption, item.location, item.city, item.search].join(' '),
-    coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
-    search: addGeographyToSearch(item),
-  }))
-
-  // reverse order for albums in ascending order (oldest on top)
-  const allItems = (await albums.reduce(async (previousPromise, album) => {
-    const prev = await previousPromise
-    const { album: { items, meta } } = await getAlbum(gallery, album.name)
-    const albumCoordinateAccuracy = meta?.geo?.zoom ?? config.defaultZoom
-    const preparedItems = prepareItems({
-      albumName: album.name,
-      albumCoordinateAccuracy,
-      items,
-    })
-    return prev.concat(preparedItems)
-  }, Promise.resolve([] as ServerSideAllItem[]))).reverse()
-
-  return {
-    items: allItems, ...indexKeywords(allItems),
-  }
+  return getAllItems(gallery, personsPageItemMapper, false)
 }
 
 export default get
diff --git a/src/lib/xml.ts b/src/lib/xml.ts
index 118307de..37b0f791 100644
--- a/src/lib/xml.ts
+++ b/src/lib/xml.ts
@@ -3,21 +3,21 @@ import fs from 'node:fs/promises'
 import xml2js, { type ParserOptions } from 'xml2js'
 
 import type {
-  AlbumMeta, Gallery, XmlAlbum, XmlGallery, XmlPersons,
+  AlbumMeta, Gallery, RawXmlAlbum, XmlAlbum, XmlGallery, XmlPersons,
 } from '../types/common'
 
 const parseOptions: ParserOptions = { explicitArray: false, normalizeTags: true, tagNameProcessors: [(name) => camelCase(name)] }
 const parser = new xml2js.Parser(parseOptions)
 
-/**
-* Get Album XML from local filesystem
-* @param {string} gallery name of gallery
-* @param {string} album name of album
-* @returns {string} album XML
-*/
-async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string): Promise<XmlAlbum> {
+const rawParseOptions: ParserOptions = { explicitArray: false }
+const rawParser = new xml2js.Parser(rawParseOptions)
+
+async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string): Promise<XmlAlbum>
+async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string, options: ParserOptions): Promise<RawXmlAlbum>
+async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string, options?: ParserOptions): Promise<XmlAlbum | RawXmlAlbum> {
   const fileBuffer = await fs.readFile(`public/galleries/${gallery}/${album}.xml`)
-  return parser.parseStringPromise(fileBuffer)
+  const selectedParser = options === rawParseOptions ? rawParser : (options ? new xml2js.Parser(options) : parser)
+  return selectedParser.parseStringPromise(fileBuffer)
 }
 
 /**
@@ -41,6 +41,7 @@ async function readPersons(gallery: Gallery): Promise<XmlPersons> {
 }
 
 export {
+  rawParseOptions,
   readAlbum,
   readGallery,
   readPersons,
diff --git a/src/models/__tests__/album.test.ts b/src/models/__tests__/album.test.ts
index 6681f520..22c99228 100644
--- a/src/models/__tests__/album.test.ts
+++ b/src/models/__tests__/album.test.ts
@@ -1,6 +1,7 @@
-import config from '../config'
 import type { XmlAlbum, XmlItem } from '../../types/common'
-import transformJsonSchema, { transformPersons, transformReference } from '../album'
+import { transformReference } from '../../utils/reference'
+import transformJsonSchema, { transformPersons } from '../album'
+import config from '../config'
 
 describe('Album library', () => {
   describe('transformJsonSchema', () => {
@@ -193,7 +194,7 @@ describe('Album library', () => {
           source: 'youtube',
         },
       }
-      const actual = transformReference(mock)
+      const actual = transformReference(mock.ref)
       if (actual === null) {
         expect(actual).not.toBeNull()
       } else {
@@ -209,7 +210,7 @@ describe('Album library', () => {
           source: 'wikipedia',
         },
       }
-      const actual = transformReference(mock)
+      const actual = transformReference(mock.ref)
       if (actual === null) {
         expect(actual).not.toBeNull()
       } else {
diff --git a/src/models/album.ts b/src/models/album.ts
index b92b7304..78d4fad5 100644
--- a/src/models/album.ts
+++ b/src/models/album.ts
@@ -1,16 +1,16 @@
-import config from './config'
 import utilsFactory from '../lib/utils'
 import type {
   Album,
   AlbumMeta,
   Item,
-  ItemReferenceSource,
   Person,
   PersonItem,
   XmlAlbum,
   XmlItem,
 } from '../types/common'
 import { isNotEmpty, removeUndefinedFields } from '../utils'
+import { transformReference } from '../utils/reference'
+import config from './config'
 
 export type ErrorOptionalMessage = { album: object[]; error?: { message: string } }
 export const errorSchema = (message: string): ErrorOptionalMessage => {
@@ -45,27 +45,39 @@ function isValidItem(schema: unknown): schema is Item {
 }
 
 function title(item: XmlItem): string {
-  if (isNotEmpty(item.photoLoc) && isNotEmpty(item.photoCity)) {
-    return `${item.photoLoc} (${item.photoCity})`
+  const photoCity = item.photoCity ?? ''
+  const photoLoc = item.photoLoc ?? ''
+
+  if (isNotEmpty(photoLoc) && isNotEmpty(photoCity)) {
+    return `${photoLoc} (${photoCity})`
+  }
+
+  if (isNotEmpty(photoLoc)) {
+    return photoLoc
   }
 
-  if (isNotEmpty(item.photoLoc)) {
-    return item.photoLoc
+  if (isNotEmpty(photoCity)) {
+    return photoCity
   }
 
-  return item.photoCity
+  // If both are empty, return a default
+  return 'Untitled'
 }
 
 function transformCaption(item: XmlItem, debug: DebugInfo) {
-  if (!('thumbCaption' in item) || item.thumbCaption === '') {
-    throw new ReferenceError(missingXmlMessage('thumb_caption', debug))
+  const thumbCaption = item.thumbCaption ?? ''
+
+  if (thumbCaption === '') {
+    // Use filename as fallback caption
+    const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+    return filename
   }
 
   if (item.type === 'video') {
-    return `Video: ${item.thumbCaption}`
+    return `Video: ${thumbCaption}`
   }
 
-  return item.thumbCaption
+  return thumbCaption
 }
 
 function assertCannotReach(x: never) {
@@ -96,32 +108,6 @@ export const transformPersons = (photoSearchValues: XmlItem['search'], definedPe
   return null
 }
 
-export const transformReference = (item: XmlItem): [string, string] | null => {
-  const baseUrl = (source: ItemReferenceSource) => {
-    switch (source) {
-      case 'facebook':
-        return 'https://www.facebook.com/'
-      case 'google':
-        return 'https://www.google.com/search?q='
-      case 'instagram':
-        return 'https://www.instagram.com/'
-      case 'wikipedia':
-        return 'https://en.wikipedia.org/wiki/'
-      case 'youtube':
-        return 'https://www.youtube.com/watch?v='
-      default:
-        return assertCannotReach(source)
-    }
-  }
-  if (!('ref' in item) || !item.ref) {
-    return null
-  }
-  if ('name' in item.ref && 'source' in item.ref) {
-    return [baseUrl(item.ref.source) + item.ref.name, item.ref.name]
-  }
-  return null
-}
-
 function transformMeta(dirty: XmlAlbum): AlbumMeta {
   if (!isValidMeta(dirty)) {
     return {
@@ -183,9 +169,8 @@ const transformJsonSchema = (dirty: XmlAlbum, persons: Person[]): Album => {
       filenameId: Array.isArray(filename) ? filename[0] : filename,
     }
 
-    if (!('photoCity' in item)) {
-      throw new ReferenceError(missingXmlMessage('photo_city', debugInfo))
-    }
+    // Allow photoCity to be optional, default to empty string if missing
+    const photoCity = item.photoCity ?? ''
 
     const latitude = item?.geo?.lat ? parseFloat(item.geo.lat) : null
     const longitude = item?.geo?.lon ? parseFloat(item.geo.lon) : null
@@ -199,7 +184,7 @@ const transformJsonSchema = (dirty: XmlAlbum, persons: Person[]): Album => {
       id,
       filename,
       photoDate: photoDate || null,
-      city: item.photoCity,
+      city: photoCity,
       location: item.photoLoc || null,
       caption: transformCaption(item, debugInfo),
       description: item.photoDesc || null,
@@ -212,7 +197,7 @@ const transformJsonSchema = (dirty: XmlAlbum, persons: Person[]): Album => {
       photoPath,
       mediaPath: (item.type === 'video' && videoPaths) ? videoPaths[0] : photoPath,
       videoPaths,
-      reference: transformReference(item),
+      reference: transformReference(item?.ref),
     }
 
     return removeUndefinedFields(out)
diff --git a/src/types/common.d.ts b/src/types/common.d.ts
index a504128f..1ed8971d 100644
--- a/src/types/common.d.ts
+++ b/src/types/common.d.ts
@@ -64,18 +64,13 @@ type Item = {
   reference: [string, string] | null,
 }
 
-type XmlItem = {
+type XmlCaseItem<TCamelCase extends boolean = true> = {
   $: {
     id: string,
   },
   type?: 'video' | 'photo',
   size?: { w: string, h: string },
   filename: string | string[],
-  photoDate: string | null,
-  photoCity: string,
-  photoLoc?: string,
-  thumbCaption: string,
-  photoDesc?: string,
   search?: string,
   geo?: {
     lat: string,
@@ -86,12 +81,24 @@ type XmlItem = {
     name: string,
     source: ItemReferenceSource,
   }
-}
-
-type XmlAlbum = {
+} & (TCamelCase extends true ? {
+  photoDate: string | null,
+  photoCity: string,
+  photoLoc?: string,
+  thumbCaption: string,
+  photoDesc?: string,
+} : {
+  photo_date: string | null,
+  photo_city: string,
+  photo_loc?: string,
+  thumb_caption?: string,
+  photo_desc?: string,
+})
+
+type XmlCaseAlbum<TCamelCase extends boolean = true> = {
   album: {
     meta?: XmlMeta,
-    item?: XmlItem | XmlItem[]
+    item?: XmlCaseItem<TCamelCase> | XmlCaseItem<TCamelCase>[]
   },
 }
 
@@ -174,6 +181,11 @@ declare global {
   }
 }
 
+type XmlItem = XmlCaseItem<true>
+type RawXmlItem = XmlCaseItem<false>
+type XmlAlbum = XmlCaseAlbum<true>
+type RawXmlAlbum = XmlCaseAlbum<false>
+
 export type {
   Gallery,
   AlbumMeta,
@@ -185,11 +197,13 @@ export type {
   ServerSideAlbumItem,
   ServerSideAllItem,
   XmlItem,
+  RawXmlItem,
   Person,
   PersonItem,
   XmlPerson,
   XmlPersons,
   XmlAlbum,
+  RawXmlAlbum,
   Item,
   ItemReferenceSource,
   IndexedKeywords,
diff --git a/src/utils/reference.ts b/src/utils/reference.ts
new file mode 100644
index 00000000..d7f71b82
--- /dev/null
+++ b/src/utils/reference.ts
@@ -0,0 +1,24 @@
+import type { ItemReferenceSource, XmlItem } from '../types/common'
+
+export function buildReferenceUrl(source: ItemReferenceSource, name: string): string {
+  const baseUrls: Record<ItemReferenceSource, string> = {
+    facebook: 'https://www.facebook.com/',
+    google: 'https://www.google.com/search?q=',
+    instagram: 'https://www.instagram.com/',
+    wikipedia: 'https://en.wikipedia.org/wiki/',
+    youtube: 'https://www.youtube.com/watch?v=',
+  }
+
+  return baseUrls[source] + encodeURIComponent(name)
+}
+
+export function transformReference(ref: XmlItem['ref']): [string, string] | null {
+  if (!ref) {
+    return null
+  }
+  if ('name' in ref && 'source' in ref) {
+    const url = buildReferenceUrl(ref.source, ref.name)
+    return [url, ref.name]
+  }
+  return null
+}
diff --git a/src/utils/search.ts b/src/utils/search.ts
new file mode 100644
index 00000000..35d95cfe
--- /dev/null
+++ b/src/utils/search.ts
@@ -0,0 +1,97 @@
+// Helper functions extracted from the component for performance
+// and to keep the hook logic clean.
+
+const AND_OPERATOR = '&&'
+const OR_OPERATOR = '||'
+
+const normalize = (text: string) =>
+  text
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+
+/**
+ * Matches a search keyword against a corpus string using boolean operators.
+ * Supports AND (&&) and OR (||) operators with single-level parentheses.
+ *
+ * Simple searches (words separated by spaces) are treated as implicit AND operations.
+ * For example, "apple banana" matches text containing both "apple" AND "banana".
+ *
+ * Limitation: Nested parentheses are NOT supported. Expressions like `((a || b) && c)`
+ * or `(a && (b || c))` will not be evaluated correctly. Only simple single-level
+ * parentheses work: `(a || b) && c` or `a && (b || c)`.
+ *
+ * @param {string} corpus - The text to search within
+ * @param {string} kword - The search keyword with optional boolean operators (&&, ||) and parentheses
+ * @returns {boolean} True if the keyword matches the corpus
+ *
+ * @example
+ * ```ts
+ * matchCorpus('apple banana', 'apple banana') // true (implicit AND)
+ * matchCorpus('apple banana', 'apple && banana') // true
+ * matchCorpus('orange banana', 'apple || orange') // true
+ * matchCorpus('apple banana', '(apple || orange) && banana') // true
+ * matchCorpus('text', '((a || b) && c)') // NOT SUPPORTED - will not work correctly
+ * ```
+ */
+export const matchCorpus = (corpus: string, kword: string): boolean => {
+  const normalizedCorpus = normalize(corpus)
+  const normalizedKeyword = normalize(kword)
+
+  const evaluateExpression = (expr: string): boolean => {
+    // If there's no AND or OR operator, treat spaces as implicit AND
+    if (!expr.includes(AND_OPERATOR) && !expr.includes(OR_OPERATOR)) {
+      const terms = expr.split(/\s+/).filter(t => t.length > 0)
+      return terms.every((term) => normalizedCorpus.includes(term.trim()))
+    }
+
+    // If there's no AND operator, evaluate as OR expression
+    if (!expr.includes(AND_OPERATOR)) {
+      return expr
+        .split(OR_OPERATOR)
+        .some((term) => normalizedCorpus.includes(term.trim()))
+    }
+
+    // Split by AND carefully, preserving content inside parentheses
+    const andParts: string[] = []
+    let currentPart = ''
+    let depth = 0
+
+    for (let i = 0; i < expr.length; i++) {
+      const char = expr[i]
+      const nextChar = expr[i + 1]
+
+      if (char === '(') depth++
+      if (char === ')') depth--
+
+      // Check for && outside of parentheses
+      if (char === '&' && nextChar === '&' && depth === 0) {
+        andParts.push(currentPart.trim())
+        currentPart = ''
+        i++ // skip the second &
+        continue
+      }
+
+      currentPart += char
+    }
+    if (currentPart.trim()) {
+      andParts.push(currentPart.trim())
+    }
+
+    return andParts.every((part) => {
+      // Check if this part has parentheses
+      const parenMatch = part.match(/^\((.*)\)$/)
+      if (parenMatch) {
+        const innerExpr = parenMatch[1]
+        return innerExpr
+          .split(OR_OPERATOR)
+          .some((term) => normalizedCorpus.includes(term.trim()))
+      }
+
+      // Regular term - check if corpus contains it
+      return normalizedCorpus.includes(part)
+    })
+  }
+
+  return evaluateExpression(normalizedKeyword)
+}