diff --git a/commands/IndexDatasets.ts b/commands/IndexDatasets.ts
index 6044af4..7c2d494 100644
--- a/commands/IndexDatasets.ts
+++ b/commands/IndexDatasets.ts
@@ -8,7 +8,8 @@ import { readFileSync } from 'fs';
 import { transform } from 'saxon-js';
 import { Client } from '@opensearch-project/opensearch';
 
-const client = new Client({ node: 'http://localhost:9200' }); // replace with your OpenSearch endpoint
+const opensearchNode = process.env.OPENSEARCH_HOST || 'localhost';
+const client = new Client({ node: `http://${opensearchNode}:9200` }); // replace with your OpenSearch endpoint
 
 export default class IndexDatasets extends BaseCommand {
     public static commandName = 'index:datasets';
diff --git a/package-lock.json b/package-lock.json
index b0acb8e..a2371a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2759,9 +2759,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "8.51.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
-            "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
+            "version": "8.52.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
+            "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
             "dev": true,
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2783,22 +2783,22 @@
             }
         },
         "node_modules/@fontsource/archivo-black": {
-            "version": "5.0.15",
-            "resolved": "https://registry.npmjs.org/@fontsource/archivo-black/-/archivo-black-5.0.15.tgz",
-            "integrity": "sha512-5NDJFAsYSZ7lkVQL6d+ulB46KiQGNOQsKdpR+xKSx5CfaaR1Cx9TZVDqvsLtnh9baEJThzwzNsydtQP+SGTg+w=="
+            "version": "5.0.17",
+            "resolved": "https://registry.npmjs.org/@fontsource/archivo-black/-/archivo-black-5.0.17.tgz",
+            "integrity": "sha512-5LB93AsMUxofgIkHz7lSBfJFXYBPRqCV6MRLhOlbFLwXW50frsaryFFvT+ZqtsDLPrGPvPv0FD5Cqzkp0g4Paw=="
         },
         "node_modules/@fontsource/inter": {
-            "version": "5.0.13",
-            "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.0.13.tgz",
-            "integrity": "sha512-FVIBhP9X/x02blF2VQl2Pji/c3jUjkWEQ9bom4vIrGwO1MlHRDXhXx9iA1hhjpcCIfH3oX68ihIBdYcFnOXhsg=="
+            "version": "5.0.15",
+            "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.0.15.tgz",
+            "integrity": "sha512-/IoWYEXl8lqJEx50JqNPT+bI4VNwxb/bg2oOfvG8PiEsDsmHRFvWBVHlohBNn1+QdBf+KbAjU/gb4vlGOSsVWw=="
         },
         "node_modules/@humanwhocodes/config-array": {
-            "version": "0.11.11",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
-            "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
+            "version": "0.11.13",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
+            "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
             "dev": true,
             "dependencies": {
-                "@humanwhocodes/object-schema": "^1.2.1",
+                "@humanwhocodes/object-schema": "^2.0.1",
                 "debug": "^4.1.1",
                 "minimatch": "^3.0.5"
             },
@@ -2820,9 +2820,9 @@
             }
         },
         "node_modules/@humanwhocodes/object-schema": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-            "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
+            "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
             "dev": true
         },
         "node_modules/@inertiajs/core": {
@@ -3610,14 +3610,14 @@
             "dev": true
         },
         "node_modules/@symfony/webpack-encore": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/@symfony/webpack-encore/-/webpack-encore-4.4.0.tgz",
-            "integrity": "sha512-p3n2Z16sGV6odZ3ihIU+gupYc55KfrfCt62+Gppe8MUo6QuT5Bk2cXXjR4Hb89KvCRDHnjYEWVfnewRsfE8TRQ==",
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@symfony/webpack-encore/-/webpack-encore-4.5.0.tgz",
+            "integrity": "sha512-eGHtQc1BDDj7hS35FyIDxQdgQcgKZ5kPh9nLLUihyDE37kPav/id1PfaHoAfydqQyv4QHsXQzLfdYC7k8agFLw==",
             "dev": true,
             "dependencies": {
                 "@nuxt/friendly-errors-webpack-plugin": "^2.5.1",
                 "assets-webpack-plugin": "7.0.*",
-                "babel-loader": "^8.2.5",
+                "babel-loader": "^9.1.3",
                 "chalk": "^4.0.0",
                 "clean-webpack-plugin": "^4.0.0",
                 "css-loader": "^6.7.0",
@@ -3640,7 +3640,7 @@
                 "encore": "bin/encore.js"
             },
             "engines": {
-                "node": ">=14.0.0"
+                "node": ">=16.0.0"
             },
             "peerDependencies": {
                 "@babel/core": "^7.17.0",
@@ -3655,7 +3655,7 @@
                 "eslint": "^8.0.0",
                 "eslint-webpack-plugin": "^3.1.0 || ^4.0.0",
                 "file-loader": "^6.0.0",
-                "fork-ts-checker-webpack-plugin": "^7.0.0",
+                "fork-ts-checker-webpack-plugin": "^7.0.0 || ^8.0.0 || ^9.0.0",
                 "handlebars": "^4.7.7",
                 "handlebars-loader": "^1.7.0",
                 "less": "^4.0.0",
@@ -3983,9 +3983,9 @@
             }
         },
         "node_modules/@types/express-serve-static-core": {
-            "version": "4.17.38",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.38.tgz",
-            "integrity": "sha512-hXOtc0tuDHZPFwwhuBJXPbjemWtXnJjbvuuyNH2Y5Z6in+iXc63c4eXYDc7GGGqHy+iwYqAJMdaItqdnbcBKmg==",
+            "version": "4.17.39",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz",
+            "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*",
@@ -4538,50 +4538,56 @@
                 "url": "https://opencollective.com/typescript-eslint"
             }
         },
+        "node_modules/@ungap/structured-clone": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
+            "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+            "dev": true
+        },
         "node_modules/@vue/compiler-core": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
-            "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.6.tgz",
+            "integrity": "sha512-2JNjemwaNwf+MkkatATVZi7oAH1Hx0B04DdPH3ZoZ8vKC1xZVP7nl4HIsk8XYd3r+/52sqqoz9TWzYc3yE9dqA==",
             "dependencies": {
-                "@babel/parser": "^7.21.3",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/shared": "3.3.6",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
-            "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.6.tgz",
+            "integrity": "sha512-1MxXcJYMHiTPexjLAJUkNs/Tw2eDf2tY3a0rL+LfuWyiKN2s6jvSwywH3PWD8bKICjfebX3GWx2Os8jkRDq3Ng==",
             "dependencies": {
-                "@vue/compiler-core": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-core": "3.3.6",
+                "@vue/shared": "3.3.6"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
-            "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.6.tgz",
+            "integrity": "sha512-/Kms6du2h1VrXFreuZmlvQej8B1zenBqIohP0690IUBkJjsFvJxY0crcvVRJ0UhMgSR9dewB+khdR1DfbpArJA==",
             "dependencies": {
-                "@babel/parser": "^7.20.15",
-                "@vue/compiler-core": "3.3.4",
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/compiler-ssr": "3.3.4",
-                "@vue/reactivity-transform": "3.3.4",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/compiler-core": "3.3.6",
+                "@vue/compiler-dom": "3.3.6",
+                "@vue/compiler-ssr": "3.3.6",
+                "@vue/reactivity-transform": "3.3.6",
+                "@vue/shared": "3.3.6",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.0",
-                "postcss": "^8.1.10",
+                "magic-string": "^0.30.5",
+                "postcss": "^8.4.31",
                 "source-map-js": "^1.0.2"
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
-            "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.6.tgz",
+            "integrity": "sha512-QTIHAfDCHhjXlYGkUg5KH7YwYtdUM1vcFl/FxFDlD6d0nXAmnjizka3HITp8DGudzHndv2PjKVS44vqqy0vP4w==",
             "dependencies": {
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-dom": "3.3.6",
+                "@vue/shared": "3.3.6"
             }
         },
         "node_modules/@vue/devtools-api": {
@@ -4591,42 +4597,42 @@
             "dev": true
         },
         "node_modules/@vue/reactivity": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
-            "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.6.tgz",
+            "integrity": "sha512-gtChAumfQz5lSy5jZXfyXbKrIYPf9XEOrIr6rxwVyeWVjFhJwmwPLtV6Yis+M9onzX++I5AVE9j+iPH60U+B8Q==",
             "dependencies": {
-                "@vue/shared": "3.3.4"
+                "@vue/shared": "3.3.6"
             }
         },
         "node_modules/@vue/reactivity-transform": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
-            "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.6.tgz",
+            "integrity": "sha512-RlJl4dHfeO7EuzU1iJOsrlqWyJfHTkJbvYz/IOJWqu8dlCNWtxWX377WI0VsbAgBizjwD+3ZjdnvSyyFW1YVng==",
             "dependencies": {
-                "@babel/parser": "^7.20.15",
-                "@vue/compiler-core": "3.3.4",
-                "@vue/shared": "3.3.4",
+                "@babel/parser": "^7.23.0",
+                "@vue/compiler-core": "3.3.6",
+                "@vue/shared": "3.3.6",
                 "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.0"
+                "magic-string": "^0.30.5"
             }
         },
         "node_modules/@vue/runtime-core": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
-            "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.6.tgz",
+            "integrity": "sha512-qp7HTP1iw1UW2ZGJ8L3zpqlngrBKvLsDAcq5lA6JvEXHmpoEmjKju7ahM9W2p/h51h0OT5F2fGlP/gMhHOmbUA==",
             "dependencies": {
-                "@vue/reactivity": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/reactivity": "3.3.6",
+                "@vue/shared": "3.3.6"
             }
         },
         "node_modules/@vue/runtime-dom": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
-            "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.6.tgz",
+            "integrity": "sha512-AoX3Cp8NqMXjLbIG9YR6n/pPLWE9TiDdk6wTJHFnl2GpHzDFH1HLBC9wlqqQ7RlnvN3bVLpzPGAAH00SAtOxHg==",
             "dependencies": {
-                "@vue/runtime-core": "3.3.4",
-                "@vue/shared": "3.3.4",
-                "csstype": "^3.1.1"
+                "@vue/runtime-core": "3.3.6",
+                "@vue/shared": "3.3.6",
+                "csstype": "^3.1.2"
             }
         },
         "node_modules/@vue/runtime-dom/node_modules/csstype": {
@@ -4635,21 +4641,21 @@
             "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
         },
         "node_modules/@vue/server-renderer": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
-            "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.6.tgz",
+            "integrity": "sha512-kgLoN43W4ERdZ6dpyy+gnk2ZHtcOaIr5Uc/WUP5DRwutgvluzu2pudsZGoD2b7AEJHByUVMa9k6Sho5lLRCykw==",
             "dependencies": {
-                "@vue/compiler-ssr": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-ssr": "3.3.6",
+                "@vue/shared": "3.3.6"
             },
             "peerDependencies": {
-                "vue": "3.3.4"
+                "vue": "3.3.6"
             }
         },
         "node_modules/@vue/shared": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-            "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.6.tgz",
+            "integrity": "sha512-Xno5pEqg8SVhomD0kTSmfh30ZEmV/+jZtyh39q6QflrjdJCXah5lrnOLi9KB6a5k5aAHXMXjoMnxlzUkCNfWLQ=="
         },
         "node_modules/@vue/tsconfig": {
             "version": "0.4.0",
@@ -5657,22 +5663,133 @@
             }
         },
         "node_modules/babel-loader": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
-            "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
+            "version": "9.1.3",
+            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
+            "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
             "dev": true,
             "dependencies": {
-                "find-cache-dir": "^3.3.1",
-                "loader-utils": "^2.0.0",
-                "make-dir": "^3.1.0",
-                "schema-utils": "^2.6.5"
+                "find-cache-dir": "^4.0.0",
+                "schema-utils": "^4.0.0"
             },
             "engines": {
-                "node": ">= 8.9"
+                "node": ">= 14.15.0"
             },
             "peerDependencies": {
-                "@babel/core": "^7.0.0",
-                "webpack": ">=2"
+                "@babel/core": "^7.12.0",
+                "webpack": ">=5"
+            }
+        },
+        "node_modules/babel-loader/node_modules/find-cache-dir": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+            "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
+            "dev": true,
+            "dependencies": {
+                "common-path-prefix": "^3.0.0",
+                "pkg-dir": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/babel-loader/node_modules/find-up": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+            "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
+            "dev": true,
+            "dependencies": {
+                "locate-path": "^7.1.0",
+                "path-exists": "^5.0.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/babel-loader/node_modules/locate-path": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+            "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
+            "dev": true,
+            "dependencies": {
+                "p-locate": "^6.0.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/babel-loader/node_modules/p-limit": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+            "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+            "dev": true,
+            "dependencies": {
+                "yocto-queue": "^1.0.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/babel-loader/node_modules/p-locate": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+            "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+            "dev": true,
+            "dependencies": {
+                "p-limit": "^4.0.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/babel-loader/node_modules/path-exists": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+            "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+            "dev": true,
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/babel-loader/node_modules/pkg-dir": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+            "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
+            "dev": true,
+            "dependencies": {
+                "find-up": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/babel-loader/node_modules/yocto-queue": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+            "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+            "dev": true,
+            "engines": {
+                "node": ">=12.20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/babel-plugin-polyfill-corejs2": {
@@ -6103,12 +6220,13 @@
             }
         },
         "node_modules/call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+            "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.1",
+                "set-function-length": "^1.1.1"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -6172,9 +6290,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001551",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001551.tgz",
-            "integrity": "sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==",
+            "version": "1.0.30001553",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001553.tgz",
+            "integrity": "sha512-N0ttd6TrFfuqKNi+pMgWJTb9qrdJu4JSpgPFLe/lrD19ugC6fZgF0pUewRowDwzdDnb9V41mFcdlYgl/PyKf4A==",
             "dev": true,
             "funding": [
                 {
@@ -6666,6 +6784,12 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/common-path-prefix": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+            "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
+            "dev": true
+        },
         "node_modules/commondir": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -6834,9 +6958,9 @@
             }
         },
         "node_modules/core-js-compat": {
-            "version": "3.33.0",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz",
-            "integrity": "sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==",
+            "version": "3.33.1",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz",
+            "integrity": "sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ==",
             "dev": true,
             "dependencies": {
                 "browserslist": "^4.22.1"
@@ -7084,34 +7208,6 @@
                 }
             }
         },
-        "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3"
-            },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
-            }
-        },
         "node_modules/css-minimizer-webpack-plugin/node_modules/has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -7136,31 +7232,6 @@
                 "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
-        "node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-            "dev": true,
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.9.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.1.0"
-            },
-            "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
         "node_modules/css-minimizer-webpack-plugin/node_modules/supports-color": {
             "version": "8.1.1",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -7657,6 +7728,19 @@
                 "node": ">=0.8"
             }
         },
+        "node_modules/define-data-property": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+            "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+            "dependencies": {
+                "get-intrinsic": "^1.2.1",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/define-lazy-prop": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -8068,9 +8152,9 @@
             "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.559",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.559.tgz",
-            "integrity": "sha512-iS7KhLYCSJbdo3rUSkhDTVuFNCV34RKs2UaB9Ecr7VlqzjjWW//0nfsFF5dtDmyXlZQaDYYtID5fjtC/6lpRug==",
+            "version": "1.4.563",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.563.tgz",
+            "integrity": "sha512-dg5gj5qOgfZNkPNeyKBZQAQitIQ/xwfIDmEQJHCbXaD9ebTZxwJXUsDYcBlAvZGZLi+/354l35J1wkmP6CqYaw==",
             "dev": true
         },
         "node_modules/emittery": {
@@ -8219,18 +8303,19 @@
             }
         },
         "node_modules/eslint": {
-            "version": "8.51.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
-            "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
+            "version": "8.52.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
+            "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
             "dev": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.6.1",
                 "@eslint/eslintrc": "^2.1.2",
-                "@eslint/js": "8.51.0",
-                "@humanwhocodes/config-array": "^0.11.11",
+                "@eslint/js": "8.52.0",
+                "@humanwhocodes/config-array": "^0.11.13",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@nodelib/fs.walk": "^1.2.8",
+                "@ungap/structured-clone": "^1.2.0",
                 "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
                 "cross-spawn": "^7.0.2",
@@ -9341,14 +9426,14 @@
             }
         },
         "node_modules/get-intrinsic": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-            "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+            "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
+                "function-bind": "^1.1.2",
                 "has-proto": "^1.0.1",
-                "has-symbols": "^1.0.3"
+                "has-symbols": "^1.0.3",
+                "hasown": "^2.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -9672,6 +9757,17 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/gopd": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+            "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+            "dependencies": {
+                "get-intrinsic": "^1.1.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/graceful-fs": {
             "version": "4.2.11",
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -9689,14 +9785,6 @@
             "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
             "dev": true
         },
-        "node_modules/has": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
-            "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
         "node_modules/has-ansi": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -9760,6 +9848,17 @@
                 "node": ">=8"
             }
         },
+        "node_modules/has-property-descriptors": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+            "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+            "dependencies": {
+                "get-intrinsic": "^1.2.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/has-proto": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
@@ -9860,6 +9959,17 @@
             "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
             "dev": true
         },
+        "node_modules/hasown": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+            "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/haye": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/haye/-/haye-3.0.0.tgz",
@@ -10353,11 +10463,11 @@
             "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
         },
         "node_modules/is-core-module": {
-            "version": "2.13.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-            "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+            "version": "2.13.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+            "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
             "dependencies": {
-                "has": "^1.0.3"
+                "hasown": "^2.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -11253,17 +11363,67 @@
             }
         },
         "node_modules/knex-dynamic-connection": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/knex-dynamic-connection/-/knex-dynamic-connection-3.1.0.tgz",
-            "integrity": "sha512-owRQ9cHBtaBUfYBs/dyt1s/Y0PYwUE66apnfYpzzMTkN2tNlzC1s7owqDJleHOelhJERZgd4jd1BZgcdfXLEhQ==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/knex-dynamic-connection/-/knex-dynamic-connection-3.1.1.tgz",
+            "integrity": "sha512-Omq2Mw+5LkjJvZX+ESWpLx2FYkH9SB6Qq4Jad7f2LNQOQV1VLq91QQqtEhkgprnQuT3IUvzFooARpSN1uzoMEg==",
             "dependencies": {
                 "debug": "^4.3.4",
-                "knex": "^2.5.0"
+                "knex": "^3.0.1"
             },
             "engines": {
                 "node": ">=14.0.0"
             }
         },
+        "node_modules/knex-dynamic-connection/node_modules/knex": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/knex/-/knex-3.0.1.tgz",
+            "integrity": "sha512-ruASxC6xPyDklRdrcDy6a9iqK+R9cGK214aiQa+D9gX2ZnHZKv6o6JC9ZfgxILxVAul4bZ13c3tgOAHSuQ7/9g==",
+            "dependencies": {
+                "colorette": "2.0.19",
+                "commander": "^10.0.0",
+                "debug": "4.3.4",
+                "escalade": "^3.1.1",
+                "esm": "^3.2.25",
+                "get-package-type": "^0.1.0",
+                "getopts": "2.3.0",
+                "interpret": "^2.2.0",
+                "lodash": "^4.17.21",
+                "pg-connection-string": "2.6.1",
+                "rechoir": "^0.8.0",
+                "resolve-from": "^5.0.0",
+                "tarn": "^3.0.2",
+                "tildify": "2.0.0"
+            },
+            "bin": {
+                "knex": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=16"
+            },
+            "peerDependenciesMeta": {
+                "better-sqlite3": {
+                    "optional": true
+                },
+                "mysql": {
+                    "optional": true
+                },
+                "mysql2": {
+                    "optional": true
+                },
+                "pg": {
+                    "optional": true
+                },
+                "pg-native": {
+                    "optional": true
+                },
+                "sqlite3": {
+                    "optional": true
+                },
+                "tedious": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/launch-editor": {
             "version": "2.6.1",
             "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
@@ -11781,59 +11941,6 @@
                 "webpack": "^5.0.0"
             }
         },
-        "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3"
-            },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
-            }
-        },
-        "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-            "dev": true,
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.9.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.1.0"
-            },
-            "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
         "node_modules/mini-svg-data-uri": {
             "version": "1.4.4",
             "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz",
@@ -12385,9 +12492,9 @@
             }
         },
         "node_modules/object-inspect": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.0.tgz",
-            "integrity": "sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==",
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+            "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -14701,23 +14808,58 @@
             }
         },
         "node_modules/schema-utils": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-            "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
             "dev": true,
             "dependencies": {
-                "@types/json-schema": "^7.0.5",
-                "ajv": "^6.12.4",
-                "ajv-keywords": "^3.5.2"
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
             },
             "engines": {
-                "node": ">= 8.9.0"
+                "node": ">= 12.13.0"
             },
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/webpack"
             }
         },
+        "node_modules/schema-utils/node_modules/ajv": {
+            "version": "8.12.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/schema-utils/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/schema-utils/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true
+        },
         "node_modules/secure-json-parse": {
             "version": "2.7.0",
             "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz",
@@ -14930,6 +15072,20 @@
             "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==",
             "dev": true
         },
+        "node_modules/set-function-length": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+            "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+            "dependencies": {
+                "define-data-property": "^1.1.1",
+                "get-intrinsic": "^1.2.1",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/set-value": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -16590,7 +16746,7 @@
             "version": "5.2.2",
             "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
             "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
-            "dev": true,
+            "devOptional": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -16908,15 +17064,23 @@
             }
         },
         "node_modules/vue": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
-            "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.6.tgz",
+            "integrity": "sha512-jJIDETeWJnoY+gfn4ZtMPMS5KtbP4ax+CT4dcQFhTnWEk8xMupFyQ0JxL28nvT/M4+p4a0ptxaV2WY0LiIxvRg==",
             "dependencies": {
-                "@vue/compiler-dom": "3.3.4",
-                "@vue/compiler-sfc": "3.3.4",
-                "@vue/runtime-dom": "3.3.4",
-                "@vue/server-renderer": "3.3.4",
-                "@vue/shared": "3.3.4"
+                "@vue/compiler-dom": "3.3.6",
+                "@vue/compiler-sfc": "3.3.6",
+                "@vue/runtime-dom": "3.3.6",
+                "@vue/server-renderer": "3.3.6",
+                "@vue/shared": "3.3.6"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
         "node_modules/vue-facing-decorator": {
@@ -17222,59 +17386,6 @@
                 "webpack": "^4.0.0 || ^5.0.0"
             }
         },
-        "node_modules/webpack-dev-middleware/node_modules/ajv": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3"
-            },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
-            }
-        },
-        "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-            "dev": true,
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.9.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.1.0"
-            },
-            "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
         "node_modules/webpack-dev-server": {
             "version": "4.15.1",
             "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
@@ -17334,34 +17445,6 @@
                 }
             }
         },
-        "node_modules/webpack-dev-server/node_modules/ajv": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3"
-            },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
-            }
-        },
         "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
@@ -17371,12 +17454,6 @@
                 "node": ">= 10"
             }
         },
-        "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
         "node_modules/webpack-dev-server/node_modules/rimraf": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -17392,25 +17469,6 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "node_modules/webpack-dev-server/node_modules/schema-utils": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-            "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
-            "dev": true,
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.9.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.1.0"
-            },
-            "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
         "node_modules/webpack-merge": {
             "version": "4.2.2",
             "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
diff --git a/resources/js/Components/Map/draw.component.vue b/resources/js/Components/Map/draw.component.vue
index b2bcb7e..2b7769e 100644
--- a/resources/js/Components/Map/draw.component.vue
+++ b/resources/js/Components/Map/draw.component.vue
@@ -4,13 +4,10 @@
       <fa-icon [icon]="faSearchLocation"></fa-icon>
     </button> -->
         <!--  -->
-        <button
-            ref="inputDraw"
+        <button ref="inputDraw"
             class="inline-flex cursor-pointer justify-center items-center whitespace-nowrap focus:outline-none transition-colors duration-150 border rounded ring-blue-700 text-black border-teal-50 hover:bg-gray-200 text-sm p-1"
-            type="button"
-            :class="[_enabled ? 'cursor-not-allowed bg-gray-200' : 'bg-teal-50 is-active']"
-            @click.prevent="draw"
-        >
+            type="button" :class="[_enabled ? 'cursor-not-allowed bg-cyan-200' : 'bg-teal-50 is-active']"
+            @click.prevent="toggleDraw">
             <BaseIcon v-if="mdiDrawPen" :path="mdiDrawPen" />
         </button>
     </div>
@@ -36,19 +33,9 @@ import { LatLngBounds } from 'leaflet/src/geo/LatLngBounds';
     },
 })
 export default class DrawControlComponent extends Vue {
-    TYPE = 'rectangle';
-
-    /**
-     * class properties.
-     */
+    public TYPE = 'rectangle';
     mdiDrawPen = mdiDrawPen;
-    featuresLayer;
-    // options = {
-    //     zIndex: 1000,
-    //     // markerClass: Marker, // CylinderGeometry,
-    //     drawingCSSClass: 'gba-editable-drawing',
-    //     drawingCursor: 'crosshair',
-    // };
+    // private featuresLayer;
 
     options = {
         shapeOptions: {
@@ -66,17 +53,17 @@ export default class DrawControlComponent extends Vue {
         metric: true, // Whether to use the metric measurement system or imperial
     };
 
-    /**
-     * Connect map id.
-     */
+
     @Prop() public mapId: string;
     // @Prop() public map: Map;
-    @Prop public southWest;
-    @Prop public northEast;
+    @Prop public southWest: LatLngBounds;
+    @Prop public northEast: LatLngBounds;
+    @Prop({
+        default: true
+    }) public preserve: boolean;
 
 
     mapService = MapService();
-    // try:
     public _enabled;
     private _map: Map;
     private _isDrawing: boolean = false;
@@ -84,8 +71,6 @@ export default class DrawControlComponent extends Vue {
     private _mapDraggable;
     private _shape: Rectangle | undefined;
 
-    // @method enable(): this
-    // Enables the handler
     enable() {
         if (this._enabled) {
             return this;
@@ -96,8 +81,6 @@ export default class DrawControlComponent extends Vue {
         return this;
     }
 
-    // @method disable(): this
-    // Disables the handler
     disable() {
         if (!this._enabled) {
             return this;
@@ -108,17 +91,13 @@ export default class DrawControlComponent extends Vue {
         return this;
     }
 
-    // @method enabled(): Boolean
-    // Returns `true` if the handler is enabled
     enabled() {
         return !!this._enabled;
     }
 
     // @Ref('inputDraw') private _inputDraw: HTMLElement;
 
-    // SimpleShape
-    // @method addHooks(): void
-    // Add listener hooks to this handler.
+
     private addHooks() {
         // L.Draw.Feature.prototype.addHooks.call(this);
         this._map = this.mapService.getMap(this.mapId);
@@ -146,10 +125,7 @@ export default class DrawControlComponent extends Vue {
         }
     }
 
-    // SimpleShape
-    // @method removeHooks(): void
-    // Remove listener hooks from this handler.
-    removeHooks() {
+    private removeHooks() {
         // L.Draw.Feature.prototype.removeHooks.call(this);
         if (this._map) {
             if (this._mapDraggable) {
@@ -171,11 +147,11 @@ export default class DrawControlComponent extends Vue {
             // document.removeEventListener('touchstart', preventDefault);
 
             // If the box element doesn't exist they must not have moved the mouse, so don't need to destroy/return
-            // if (this._shape) {
-            // 	this._map.removeLayer(this._shape);
-            // 	// delete this._shape;
-            //     this._shape = undefined;
-            // }
+            if (this._shape && this.preserve == false) {
+                this._map.removeLayer(this._shape);
+                // delete this._shape;
+                this._shape = undefined;
+            }
         }
         this._isDrawing = false;
     }
@@ -217,7 +193,7 @@ export default class DrawControlComponent extends Vue {
     private _fireCreatedEvent(shape) {
         var rectangle = new Rectangle(shape.getBounds(), this.options.shapeOptions);
         // L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this, rectangle);
-        this._map.fire('Daw.Event.CREATED', { layer: rectangle, type: this.TYPE });
+        this._map.fire('Draw.Event.CREATED', { layer: rectangle, type: this.TYPE });
     }
 
     public drawShape(southWest, northEast) {
@@ -244,11 +220,7 @@ export default class DrawControlComponent extends Vue {
         }
     }
 
-    public draw() {
-        // let map: Map = this.mapService.getMap(this.mapId);
-        // const bounds: LatLngBoundsExpression = toLatLngBounds(this.southWest, this.northEast);
-        // map.fitBounds(bounds);
-
+    public toggleDraw() {
         if (this._enabled == true) {
             this.disable();
         } else {
diff --git a/resources/js/Components/Map/map.component.vue b/resources/js/Components/Map/map.component.vue
index c6297db..2397e26 100644
--- a/resources/js/Components/Map/map.component.vue
+++ b/resources/js/Components/Map/map.component.vue
@@ -162,7 +162,7 @@ export default class MapComponent extends Vue {
         attributionControl.setPrefix(false);
 
         map.on(
-            'Daw.Event.CREATED',
+            'Draw.Event.CREATED',
             function (event) {
                 // drawnItems.clearLayers();
                 // var type = event.type;
diff --git a/resources/js/Dataset.ts b/resources/js/Dataset.ts
index 9e490ed..cf74c80 100644
--- a/resources/js/Dataset.ts
+++ b/resources/js/Dataset.ts
@@ -106,3 +106,33 @@ export interface Coverage {
     time_max?: number;
     time_absolut?: number;
 }
+
+export interface OpensearchDocument {
+    abstract_additional: Array<string>;
+    abstract_output: string;
+    author: Array<string>;
+    author_sort: Array<string>;
+    belongs_to_bibliography: boolean;
+    creating_corporation: string;
+    doctype: string;
+    geo_location: string;
+    id: number;
+    identifier: Identifier;
+    language: string;
+    licence: string;
+    publisher_name: string;
+    server_date_published: Array<number>;
+    subject: Array<string>;
+    title_output: string;
+    year: number;
+    year_inverted: number;
+}
+export interface Identifier {
+    created_at: string;
+    dataset_id: number;
+    id: number;
+    status: string; //'findable'
+    type: string; //'doi'
+    updated_at: string; //'2023-03-09T09:48:28.000Z'
+    value: string; //'10.24341/tethys.209'
+}
\ No newline at end of file
diff --git a/resources/js/Pages/Map.vue b/resources/js/Pages/Map.vue
index cb01145..4e55478 100644
--- a/resources/js/Pages/Map.vue
+++ b/resources/js/Pages/Map.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { Head } from '@inertiajs/vue3';
-import { onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted, ref, Ref } from 'vue';
 // import { MainService } from '@/Stores/main';;
 import {
-	mdiChartTimelineVariant,
-	mdiArrowLeftBoldOutline,
+	mdiChartTimelineVariant
 } from '@mdi/js';
 import LayoutGuest from '@/Layouts/LayoutGuest.vue';
 import SectionMain from '@/Components/SectionMain.vue';
@@ -23,6 +22,10 @@ import { LatLngBoundsExpression } from 'leaflet/src/geo/LatLngBounds';
 import { tileLayerWMS } from 'leaflet/src/layer/tile/TileLayer.WMS';
 import { Attribution } from 'leaflet/src/control/Control.Attribution';
 import { stardust } from '@eidellev/adonis-stardust/client';
+import DrawControlComponent from '@/Components/Map/draw.component.vue';
+import { MapService } from '@/Stores/map.service';
+import { LayerGroup } from 'leaflet/src/layer/LayerGroup'
+import { OpensearchDocument } from '@/Dataset';
 
 Map.include({
 	// @namespace Map; @method getRenderer(layer: Path): Renderer
@@ -70,15 +73,45 @@ const DEFAULT_BASE_LAYER_ATTRIBUTION = '&copy; <a target="_blank" href="http://o
 const OPEN_SEARCH_HOST = 'http://192.168.21.18';
 let map: Map;
 
+
+
 const fitBounds: LatLngBoundsExpression = [
 	[46.4318173285, 9.47996951665],
 	[49.0390742051, 16.9796667823],
 ];
 
+const mapId = 'map';
+const draw: Ref<DrawControlComponent | null> = ref(null);
+const southWest = ref(null);
+const northEast = ref(null);
+const mapService = MapService();
+const coverage = {
+	x_min: undefined,
+	y_min: undefined,
+	x_max: undefined,
+	y_max: undefined,
+	elevation_min: undefined,
+	elevation_max: undefined,
+	elevation_absolut: undefined,
+	depth_min: undefined,
+	depth_max: undefined,
+	depth_absolut: undefined,
+	time_min: undefined,
+	time_max: undefined,
+	time_absolut: undefined,
+};
+const filterLayerGroup = new LayerGroup();
+// Replace with your actual data
+const datasets: Ref<OpensearchDocument[]> = ref([]);
+
 onMounted(() => {
 	initMap();
 });
 
+onUnmounted(() => {
+	map.off('zoomend zoomlevelschange');
+});
+
 const mapOptions: MapOptions = {
 	center: [48.208174, 16.373819],
 	zoom: 3,
@@ -89,7 +122,13 @@ const mapOptions: MapOptions = {
 const initMap = async () => {
 	// init leaflet map
 	map = new Map('map', mapOptions);
+	mapService.setMap(mapId, map);
+	map.scrollWheelZoom.disable();
 	map.fitBounds(fitBounds);
+	draw.value?.toggleDraw();
+
+
+	map.addLayer(filterLayerGroup);
 
 	const attributionControl = new Attribution().addTo(map);
 	attributionControl.setPrefix(false);
@@ -106,28 +145,100 @@ const initMap = async () => {
 	};
 	layerOptions.layer.addTo(map);
 
+	map.on('Draw.Event.CREATED', handleDrawEventCreated);
+
+
+	// // const query = {
+	// // 	query: {
+	// // 		term: {
+	// // 			id: "103"
+	// // 		}
+	// // 	}
+	// // };
+	// // to do : call extra method:
 	// const query = {
-	// 	query: {
-	// 		term: {
-	// 			id: "103"
-	// 		}
-	// 	}
-	// };
-	const query = {
-		// q: 'id:103'
-		// q: 'author:"Iglseder, Christoph" OR title:"Datensatz"',
-		// q: 'author:"Iglseder"',		
-		q: '*',
-		_source: 'author,bbox_xmin,bbox_xmax,bbox_ymin,bbox_ymax,abstract,title',
-		size: 1000
-		// qf:"title^3 author^2 subject^1",
-	}
+	// 	// q: 'id:103'
+	// 	// q: 'author:"Iglseder, Christoph" OR title:"Datensatz"',
+	// 	// q: 'author:"Iglseder"',		
+	// 	q: '*',
+	// 	_source: 'author,bbox_xmin,bbox_xmax,bbox_ymin,bbox_ymax,abstract,title',
+	// 	size: 1000
+	// 	// qf:"title^3 author^2 subject^1",
+	// }
+	// try {
+	// 	let response = await axios({
+	// 		method: 'GET',
+	// 		url: OPEN_SEARCH_HOST + '/tethys-records/_search',
+	// 		headers: { 'Content-Type': 'application/json' },
+	// 		params: query
+	// 	});
+	// 	// Loop through the hits in the response
+	// 	response.data.hits.hits.forEach(hit => {
+	// 		// Get the geo_location attribute
+	// 		// var geo_location = hit._source.geo_location;
+	// 		let xMin = hit._source.bbox_xmin;
+	// 		let xMax = hit._source.bbox_xmax;
+	// 		let yMin = hit._source.bbox_ymin;
+	// 		let yMax = hit._source.bbox_ymax;
+	// 		var bbox: LatLngBoundsExpression = [[yMin, xMin], [yMax, xMax]];
+	// 		// Parse the WKT string to get the bounding box coordinates
+	// 		// var bbox = wktToBbox(geo_location);
+
+	// 		// // Add the bounding box to the map as a rectangle
+	// 		new Rectangle(bbox, { color: "#ff7800", weight: 1 }).addTo(map);
+	// 		// console.log(hit._source);
+	// 	});
+	// } catch (error) {
+	// 	console.error(error);
+	// }
+
+};
+
+
+
+const handleDrawEventCreated = async (event) => {
+	filterLayerGroup.clearLayers();
+	datasets.value = [];
+
+	let layer = event.layer;
+	let bounds = layer.getBounds();
+	// coverage.x_min = bounds.getSouthWest().lng;
+	// coverage.y_min = bounds.getSouthWest().lat;
+	// coverage.x_max = bounds.getNorthEast().lng;
+	// coverage.y_max = bounds.getNorthEast().lat;
+
+
 	try {
 		let response = await axios({
-			method: 'GET',
+			method: 'POST',
 			url: OPEN_SEARCH_HOST + '/tethys-records/_search',
 			headers: { 'Content-Type': 'application/json' },
-			params: query
+			data: {
+				"size": 1000,
+				"query": {
+					"bool": {
+						"must": {
+							"match_all": {}
+						},
+						"filter": {
+							"geo_bounding_box": {
+								"geo_location": { // replace 'location' with your geo-point field name
+									"top_left": {
+										"lat": bounds.getNorthEast().lat,
+										"lon": bounds.getSouthWest().lng
+									},
+									"bottom_right": {
+										"lat": bounds.getSouthWest().lat,
+										"lon": bounds.getNorthEast().lng
+									}
+								}
+							}
+						}
+					}
+					// _source: 'author,bbox_xmin,bbox_xmax,bbox_ymin,bbox_ymax,abstract,title',
+					// "size": 1000
+				}
+			}
 		});
 		// Loop through the hits in the response
 		response.data.hits.hits.forEach(hit => {
@@ -142,19 +253,15 @@ const initMap = async () => {
 			// var bbox = wktToBbox(geo_location);
 
 			// // Add the bounding box to the map as a rectangle
-			new Rectangle(bbox, { color: "#ff7800", weight: 1 }).addTo(map);
-			// console.log(hit._source);
+			let rect = new Rectangle(bbox, { color: "#ff7800", weight: 1 });
+			filterLayerGroup.addLayer(rect);
+
+			datasets.value.push(hit._source);
 		});
 	} catch (error) {
 		console.error(error);
 	}
-
 };
-
-onUnmounted(() => {
-	map.off('zoomend zoomlevelschange');
-});
-
 </script>
 
 <template>
@@ -167,18 +274,39 @@ onUnmounted(() => {
 			<SectionTitleLineWithButton v-bind:icon="mdiChartTimelineVariant" title="Tethys Map" main>
 				<!-- <BaseButton href="https://gitea.geologie.ac.at/geolba/tethys" target="_blank" :icon="mdiGithub"
 					label="Star on Gitea" color="contrast" rounded-full small /> -->
-					<BaseButton :route-name="stardust.route('app.login.show')" label="Login"
-                    color="white" rounded-full small />
+				<BaseButton :route-name="stardust.route('app.login.show')" label="Login" color="white" rounded-full small />
 			</SectionTitleLineWithButton>
 
 
 			<!-- <SectionBannerStarOnGitHub /> -->
 
 			<!-- <CardBox> -->
-				<div id="map" class="map-container mapDesktop mt-6 mb-6 rounded-2xl py-12 px-6 text-center"></div>
-			<!-- </CardBox> -->
+			<div id="map" class="map-container mapDesktop mt-6 mb-6 rounded-2xl py-12 px-6 text-center">
+				<DrawControlComponent ref="draw" :preserve="false" :mapId="mapId" :southWest="southWest"
+					:northEast="northEast">
+				</DrawControlComponent>
+			</div>
+
+			<div d="search-result-list-wrapper" class="flex flex-wrap col-span-24">
+				<div v-for="dataset in datasets" :key="dataset.id" class="w-full sm:w-1/2 md:w-1/3 lg:w-1/4 p-4">
+					<div class="bg-white rounded shadow p-6">
+						<h2 class="text-xl font-bold mb-2">{{ dataset.title_output }}</h2>
+						<p class="text-gray-700 mb-2">{{ dataset.abstract_output }}</p>
+						<div class="text-sm text-gray-600">
+							<div v-for="author in dataset.author" :key="author" class="mb-1">{{ author }}</div>
+						</div>
+						<div class="mt-4">
+							<span
+								class="inline-block bg-gray-200 rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2">{{
+									dataset.year }}</span>
+							<span
+								class="inline-block bg-gray-200 rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2">{{
+									dataset.language }}</span>
+						</div>
+					</div>
+				</div>
+			</div>
 
 		</SectionMain>
 		<!-- </section> -->
-	</LayoutGuest>
-</template>
+</LayoutGuest></template>