diff --git a/client/web/admin/package.json b/client/web/admin/package.json
index ef4638280..c9cc57a97 100644
--- a/client/web/admin/package.json
+++ b/client/web/admin/package.json
@@ -2,7 +2,7 @@
   "name": "corteza-webapp-admin",
   "description": "Corteza Admin WebApp",
   "private": true,
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "license": "Apache-2.0",
   "author": "Denis Arh <denis.arh@gmail.com>",
   "scripts": {
@@ -18,8 +18,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.1",
-    "@cortezaproject/corteza-vue": "^2023.9.1",
+    "@cortezaproject/corteza-js": "^2023.9.2-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.2-rc.1",
     "@fortawesome/fontawesome-svg-core": "1.2.27",
     "@fortawesome/free-regular-svg-icons": "^5.14.0",
     "@fortawesome/free-solid-svg-icons": "5.12.1",
diff --git a/client/web/admin/yarn.lock b/client/web/admin/yarn.lock
index 22aa375e2..c0308bcf9 100644
--- a/client/web/admin/yarn.lock
+++ b/client/web/admin/yarn.lock
@@ -675,10 +675,10 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.1.tgz#c3e81a4baee397902dff39d4efb5056539d671d3"
-  integrity sha512-NZpiWlBflkM6gPSOUIAYv0zT1URKNjBkzOytXDO03AAldjNOSZdc4cVfFk4bv3r7DrYu7XsyhKjYqTtgtRNt7A==
+"@cortezaproject/corteza-js@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.2-rc.1.tgz#1b3b77c3c2da262f951ec10d2e68c4b72666fe8a"
+  integrity sha512-J1zfuu9WxkvUK4pDlgbcQgsaqGCbXXYmvnbUi+rbh43WZRtWo1rVyVBSw3H6ZhYGdggb2CASDhMfh+qLS2D/Ig==
   dependencies:
     axios "^0.21.1"
     hex-rgb "^4.1.0"
@@ -689,12 +689,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.1.tgz#93be18a82750bb7954483f254b44d88a5941f5de"
-  integrity sha512-qDfnvUx+wd7ZmrbaKPuzD8RSAFCzonSZSnVBW2KCWLZc6ktpNjNF/UezNl2/UqgRoD/6NlP7BcGiQiQnOTIl2w==
+"@cortezaproject/corteza-vue@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.2-rc.1.tgz#ad659ac9152c336ebb9dfef986f28485354e1033"
+  integrity sha512-Ss1c8FXSO234CG47bRu/W00oB/U3TBDOtjiOM2mUzfsDNymuBxJ8HNL1RXbJm5lZ4il4IsvcNKVD0Ny4/JSTKg==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.1"
+    "@cortezaproject/corteza-js" "^2023.9.2-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -711,6 +711,8 @@
     i18next-http-backend "^1.3.0"
     i18next-multiload-backend-adapter "^1.0.0"
     kind-of "^6.0.3"
+    leaflet "^1.7.1"
+    leaflet-geosearch "^3.7.0"
     lodash "^4.17.21"
     moment "2.29.2"
     numeral "^2.0.6"
@@ -723,9 +725,10 @@
     v-photoswipe "^1.0.3-1"
     vue-color "^2.8.1"
     vue-echarts "^6.2.3"
-    vue-select "^3.4.0"
+    vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
+    vue2-leaflet "^2.7.1"
     vuedraggable "^2.23.0"
     vuex "^3.6.2"
     websocket-extensions "^0.1.4"
@@ -796,6 +799,13 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz#eeeec1e4e8850bed0468f938292b06cda793bf34"
   integrity sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==
 
+"@googlemaps/js-api-loader@^1.14.3":
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.16.2.tgz#3fe748e21243f8e8322c677a5525c569ae9cdbe9"
+  integrity sha512-psGw5u0QM6humao48Hn4lrChOM2/rA43ZCm3tKK9qQsEj1/VzqkCqnvGfEOshDbBQflydfaRovbKwZMF4AyqbA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -4361,7 +4371,7 @@ fast-deep-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
   integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -6237,6 +6247,19 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+leaflet-geosearch@^3.7.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/leaflet-geosearch/-/leaflet-geosearch-3.11.0.tgz#d35e7837cfb880da49ae9807ef9e0a4487b4d6eb"
+  integrity sha512-lWmryKXg7S//7q53fMyooCAyAzYxMtozeEmjrQqtkmsPmeHphaKMuFEm/uD4ZwoblBIIMXsUnuNBLvg6bSfjqA==
+  optionalDependencies:
+    "@googlemaps/js-api-loader" "^1.14.3"
+    leaflet "^1.6.0"
+
+leaflet@^1.6.0, leaflet@^1.7.1:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
@@ -10822,10 +10845,10 @@ vue-router@3.1.5:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.5.tgz#ff29b8a1e1306c526b52d4dc0532109f16c41231"
   integrity sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg==
 
-vue-select@^3.4.0:
-  version "3.18.3"
-  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.18.3.tgz#31f188d7181a4a86d07b937303c457efe863c4bc"
-  integrity sha512-nKmwxEDO4RRoZ6lWkkVE2bpgne7IJSRzSh1pIawLI7dJLZbtJuSgA0xGaLrT0pUp+JYHBDul242PwOBDHi28vg==
+vue-select@3.20.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.20.2.tgz#eaa15012b032c154d4fb51ac82ebeda2beeae54b"
+  integrity sha512-ZSzIDzyYsWZULGUxVp1h6u3yi9IZQBWX8r6kSudUI/I5J1HQKpBjRntvkrg6pr87xmm16kdChvHCDN+W84vTKw==
 
 vue-style-loader@^4.1.0:
   version "4.1.2"
@@ -10874,6 +10897,11 @@ vue2-dropzone@^3.6.0:
   dependencies:
     dropzone "^5.5.1"
 
+vue2-leaflet@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
+  integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
+
 vue@2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
diff --git a/client/web/compose/package.json b/client/web/compose/package.json
index 079dcedaa..877b1bff4 100644
--- a/client/web/compose/package.json
+++ b/client/web/compose/package.json
@@ -1,7 +1,7 @@
 {
   "name": "corteza-webapp-compose",
   "description": "Corteza Compose WebApp",
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "license": "Apache-2.0",
   "contributors": [
     "Denis Arh <denis.arh@gmail.com>"
@@ -32,8 +32,8 @@
     }
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.1",
-    "@cortezaproject/corteza-vue": "^2023.9.1",
+    "@cortezaproject/corteza-js": "^2023.9.2-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.2-rc.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.21",
     "@fortawesome/free-regular-svg-icons": "^5.10.1",
     "@fortawesome/free-solid-svg-icons": "^5.10.1",
diff --git a/client/web/compose/yarn.lock b/client/web/compose/yarn.lock
index bfb22f39c..153b01689 100644
--- a/client/web/compose/yarn.lock
+++ b/client/web/compose/yarn.lock
@@ -701,10 +701,10 @@
     "@babel/helper-validator-identifier" "^7.14.0"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.1.tgz#c3e81a4baee397902dff39d4efb5056539d671d3"
-  integrity sha512-NZpiWlBflkM6gPSOUIAYv0zT1URKNjBkzOytXDO03AAldjNOSZdc4cVfFk4bv3r7DrYu7XsyhKjYqTtgtRNt7A==
+"@cortezaproject/corteza-js@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.2-rc.1.tgz#1b3b77c3c2da262f951ec10d2e68c4b72666fe8a"
+  integrity sha512-J1zfuu9WxkvUK4pDlgbcQgsaqGCbXXYmvnbUi+rbh43WZRtWo1rVyVBSw3H6ZhYGdggb2CASDhMfh+qLS2D/Ig==
   dependencies:
     axios "^0.21.1"
     hex-rgb "^4.1.0"
@@ -715,12 +715,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.1.tgz#93be18a82750bb7954483f254b44d88a5941f5de"
-  integrity sha512-qDfnvUx+wd7ZmrbaKPuzD8RSAFCzonSZSnVBW2KCWLZc6ktpNjNF/UezNl2/UqgRoD/6NlP7BcGiQiQnOTIl2w==
+"@cortezaproject/corteza-vue@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.2-rc.1.tgz#ad659ac9152c336ebb9dfef986f28485354e1033"
+  integrity sha512-Ss1c8FXSO234CG47bRu/W00oB/U3TBDOtjiOM2mUzfsDNymuBxJ8HNL1RXbJm5lZ4il4IsvcNKVD0Ny4/JSTKg==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.1"
+    "@cortezaproject/corteza-js" "^2023.9.2-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -737,6 +737,8 @@
     i18next-http-backend "^1.3.0"
     i18next-multiload-backend-adapter "^1.0.0"
     kind-of "^6.0.3"
+    leaflet "^1.7.1"
+    leaflet-geosearch "^3.7.0"
     lodash "^4.17.21"
     moment "2.29.2"
     numeral "^2.0.6"
@@ -749,9 +751,10 @@
     v-photoswipe "^1.0.3-1"
     vue-color "^2.8.1"
     vue-echarts "^6.2.3"
-    vue-select "^3.4.0"
+    vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
+    vue2-leaflet "^2.7.1"
     vuedraggable "^2.23.0"
     vuex "^3.6.2"
     websocket-extensions "^0.1.4"
@@ -919,6 +922,13 @@
     "@fullcalendar/core" "~4.4.0"
     fast-deep-equal "^2.0.1"
 
+"@googlemaps/js-api-loader@^1.14.3":
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.16.2.tgz#3fe748e21243f8e8322c677a5525c569ae9cdbe9"
+  integrity sha512-psGw5u0QM6humao48Hn4lrChOM2/rA43ZCm3tKK9qQsEj1/VzqkCqnvGfEOshDbBQflydfaRovbKwZMF4AyqbA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -5075,7 +5085,7 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -7038,6 +7048,19 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+leaflet-geosearch@^3.7.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/leaflet-geosearch/-/leaflet-geosearch-3.11.0.tgz#d35e7837cfb880da49ae9807ef9e0a4487b4d6eb"
+  integrity sha512-lWmryKXg7S//7q53fMyooCAyAzYxMtozeEmjrQqtkmsPmeHphaKMuFEm/uD4ZwoblBIIMXsUnuNBLvg6bSfjqA==
+  optionalDependencies:
+    "@googlemaps/js-api-loader" "^1.14.3"
+    leaflet "^1.6.0"
+
+leaflet@^1.6.0, leaflet@^1.7.1:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -11748,10 +11771,10 @@ vue-router@3.1.5:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.5.tgz#ff29b8a1e1306c526b52d4dc0532109f16c41231"
   integrity sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg==
 
-vue-select@^3.4.0:
-  version "3.18.3"
-  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.18.3.tgz#31f188d7181a4a86d07b937303c457efe863c4bc"
-  integrity sha512-nKmwxEDO4RRoZ6lWkkVE2bpgne7IJSRzSh1pIawLI7dJLZbtJuSgA0xGaLrT0pUp+JYHBDul242PwOBDHi28vg==
+vue-select@3.20.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.20.2.tgz#eaa15012b032c154d4fb51ac82ebeda2beeae54b"
+  integrity sha512-ZSzIDzyYsWZULGUxVp1h6u3yi9IZQBWX8r6kSudUI/I5J1HQKpBjRntvkrg6pr87xmm16kdChvHCDN+W84vTKw==
 
 vue-sortable-tree@^1.2.2:
   version "1.2.2"
@@ -11810,6 +11833,11 @@ vue2-dropzone@^3.6.0:
   dependencies:
     dropzone "^5.5.1"
 
+vue2-leaflet@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
+  integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
+
 vue@2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
diff --git a/client/web/discovery/package.json b/client/web/discovery/package.json
index c8f5ac5f9..79914e589 100644
--- a/client/web/discovery/package.json
+++ b/client/web/discovery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corteza-discovery",
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -15,8 +15,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.1",
-    "@cortezaproject/corteza-vue": "^2023.9.1",
+    "@cortezaproject/corteza-js": "^2023.9.2-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.2-rc.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.21",
     "@fortawesome/free-regular-svg-icons": "^5.10.1",
     "@fortawesome/free-solid-svg-icons": "^5.10.1",
diff --git a/client/web/discovery/yarn.lock b/client/web/discovery/yarn.lock
index b03bcaff2..9b97cea10 100644
--- a/client/web/discovery/yarn.lock
+++ b/client/web/discovery/yarn.lock
@@ -974,10 +974,10 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.1.tgz#c3e81a4baee397902dff39d4efb5056539d671d3"
-  integrity sha512-NZpiWlBflkM6gPSOUIAYv0zT1URKNjBkzOytXDO03AAldjNOSZdc4cVfFk4bv3r7DrYu7XsyhKjYqTtgtRNt7A==
+"@cortezaproject/corteza-js@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.2-rc.1.tgz#1b3b77c3c2da262f951ec10d2e68c4b72666fe8a"
+  integrity sha512-J1zfuu9WxkvUK4pDlgbcQgsaqGCbXXYmvnbUi+rbh43WZRtWo1rVyVBSw3H6ZhYGdggb2CASDhMfh+qLS2D/Ig==
   dependencies:
     axios "^0.21.1"
     hex-rgb "^4.1.0"
@@ -988,12 +988,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.1.tgz#93be18a82750bb7954483f254b44d88a5941f5de"
-  integrity sha512-qDfnvUx+wd7ZmrbaKPuzD8RSAFCzonSZSnVBW2KCWLZc6ktpNjNF/UezNl2/UqgRoD/6NlP7BcGiQiQnOTIl2w==
+"@cortezaproject/corteza-vue@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.2-rc.1.tgz#ad659ac9152c336ebb9dfef986f28485354e1033"
+  integrity sha512-Ss1c8FXSO234CG47bRu/W00oB/U3TBDOtjiOM2mUzfsDNymuBxJ8HNL1RXbJm5lZ4il4IsvcNKVD0Ny4/JSTKg==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.1"
+    "@cortezaproject/corteza-js" "^2023.9.2-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -1010,6 +1010,8 @@
     i18next-http-backend "^1.3.0"
     i18next-multiload-backend-adapter "^1.0.0"
     kind-of "^6.0.3"
+    leaflet "^1.7.1"
+    leaflet-geosearch "^3.7.0"
     lodash "^4.17.21"
     moment "2.29.2"
     numeral "^2.0.6"
@@ -1022,9 +1024,10 @@
     v-photoswipe "^1.0.3-1"
     vue-color "^2.8.1"
     vue-echarts "^6.2.3"
-    vue-select "^3.4.0"
+    vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
+    vue2-leaflet "^2.7.1"
     vuedraggable "^2.23.0"
     vuex "^3.6.2"
     websocket-extensions "^0.1.4"
@@ -1085,6 +1088,13 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz#eeeec1e4e8850bed0468f938292b06cda793bf34"
   integrity sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==
 
+"@googlemaps/js-api-loader@^1.14.3":
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.16.2.tgz#3fe748e21243f8e8322c677a5525c569ae9cdbe9"
+  integrity sha512-psGw5u0QM6humao48Hn4lrChOM2/rA43ZCm3tKK9qQsEj1/VzqkCqnvGfEOshDbBQflydfaRovbKwZMF4AyqbA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -5019,7 +5029,7 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -6990,6 +7000,19 @@ launch-editor@^2.2.1:
     chalk "^2.3.0"
     shell-quote "^1.6.1"
 
+leaflet-geosearch@^3.7.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/leaflet-geosearch/-/leaflet-geosearch-3.11.0.tgz#d35e7837cfb880da49ae9807ef9e0a4487b4d6eb"
+  integrity sha512-lWmryKXg7S//7q53fMyooCAyAzYxMtozeEmjrQqtkmsPmeHphaKMuFEm/uD4ZwoblBIIMXsUnuNBLvg6bSfjqA==
+  optionalDependencies:
+    "@googlemaps/js-api-loader" "^1.14.3"
+    leaflet "^1.6.0"
+
+leaflet@^1.6.0, leaflet@^1.7.1:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -11753,10 +11776,10 @@ vue-router@^3.4.9:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
   integrity sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA==
 
-vue-select@^3.4.0:
-  version "3.18.3"
-  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.18.3.tgz#31f188d7181a4a86d07b937303c457efe863c4bc"
-  integrity sha512-nKmwxEDO4RRoZ6lWkkVE2bpgne7IJSRzSh1pIawLI7dJLZbtJuSgA0xGaLrT0pUp+JYHBDul242PwOBDHi28vg==
+vue-select@3.20.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.20.2.tgz#eaa15012b032c154d4fb51ac82ebeda2beeae54b"
+  integrity sha512-ZSzIDzyYsWZULGUxVp1h6u3yi9IZQBWX8r6kSudUI/I5J1HQKpBjRntvkrg6pr87xmm16kdChvHCDN+W84vTKw==
 
 vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
   version "4.1.2"
@@ -11799,6 +11822,11 @@ vue2-ace-editor@^0.0.15:
   dependencies:
     brace "^0.11.0"
 
+vue2-leaflet@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
+  integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
+
 vue@2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
diff --git a/client/web/one/package.json b/client/web/one/package.json
index 19a4f3c5b..fef357844 100644
--- a/client/web/one/package.json
+++ b/client/web/one/package.json
@@ -1,7 +1,7 @@
 {
   "name": "corteza-webapp-one",
   "description": "Corteza One WebApp",
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "license": "Apache-2.0",
   "contributors": [
     "Denis Arh <denis.arh@gmail.com>"
@@ -20,8 +20,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.1",
-    "@cortezaproject/corteza-vue": "^2023.9.1",
+    "@cortezaproject/corteza-js": "^2023.9.2-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.2-rc.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.21",
     "@fortawesome/free-regular-svg-icons": "^5.10.1",
     "@fortawesome/free-solid-svg-icons": "^5.10.1",
diff --git a/client/web/one/yarn.lock b/client/web/one/yarn.lock
index ef39838d5..6132ace06 100644
--- a/client/web/one/yarn.lock
+++ b/client/web/one/yarn.lock
@@ -675,10 +675,10 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.1.tgz#c3e81a4baee397902dff39d4efb5056539d671d3"
-  integrity sha512-NZpiWlBflkM6gPSOUIAYv0zT1URKNjBkzOytXDO03AAldjNOSZdc4cVfFk4bv3r7DrYu7XsyhKjYqTtgtRNt7A==
+"@cortezaproject/corteza-js@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.2-rc.1.tgz#1b3b77c3c2da262f951ec10d2e68c4b72666fe8a"
+  integrity sha512-J1zfuu9WxkvUK4pDlgbcQgsaqGCbXXYmvnbUi+rbh43WZRtWo1rVyVBSw3H6ZhYGdggb2CASDhMfh+qLS2D/Ig==
   dependencies:
     axios "^0.21.1"
     hex-rgb "^4.1.0"
@@ -689,12 +689,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.1.tgz#93be18a82750bb7954483f254b44d88a5941f5de"
-  integrity sha512-qDfnvUx+wd7ZmrbaKPuzD8RSAFCzonSZSnVBW2KCWLZc6ktpNjNF/UezNl2/UqgRoD/6NlP7BcGiQiQnOTIl2w==
+"@cortezaproject/corteza-vue@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.2-rc.1.tgz#ad659ac9152c336ebb9dfef986f28485354e1033"
+  integrity sha512-Ss1c8FXSO234CG47bRu/W00oB/U3TBDOtjiOM2mUzfsDNymuBxJ8HNL1RXbJm5lZ4il4IsvcNKVD0Ny4/JSTKg==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.1"
+    "@cortezaproject/corteza-js" "^2023.9.2-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -711,6 +711,8 @@
     i18next-http-backend "^1.3.0"
     i18next-multiload-backend-adapter "^1.0.0"
     kind-of "^6.0.3"
+    leaflet "^1.7.1"
+    leaflet-geosearch "^3.7.0"
     lodash "^4.17.21"
     moment "2.29.2"
     numeral "^2.0.6"
@@ -723,9 +725,10 @@
     v-photoswipe "^1.0.3-1"
     vue-color "^2.8.1"
     vue-echarts "^6.2.3"
-    vue-select "^3.4.0"
+    vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
+    vue2-leaflet "^2.7.1"
     vuedraggable "^2.23.0"
     vuex "^3.6.2"
     websocket-extensions "^0.1.4"
@@ -781,6 +784,13 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz#eeeec1e4e8850bed0468f938292b06cda793bf34"
   integrity sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==
 
+"@googlemaps/js-api-loader@^1.14.3":
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.16.2.tgz#3fe748e21243f8e8322c677a5525c569ae9cdbe9"
+  integrity sha512-psGw5u0QM6humao48Hn4lrChOM2/rA43ZCm3tKK9qQsEj1/VzqkCqnvGfEOshDbBQflydfaRovbKwZMF4AyqbA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -4123,7 +4133,7 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -5863,6 +5873,19 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+leaflet-geosearch@^3.7.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/leaflet-geosearch/-/leaflet-geosearch-3.11.0.tgz#d35e7837cfb880da49ae9807ef9e0a4487b4d6eb"
+  integrity sha512-lWmryKXg7S//7q53fMyooCAyAzYxMtozeEmjrQqtkmsPmeHphaKMuFEm/uD4ZwoblBIIMXsUnuNBLvg6bSfjqA==
+  optionalDependencies:
+    "@googlemaps/js-api-loader" "^1.14.3"
+    leaflet "^1.6.0"
+
+leaflet@^1.6.0, leaflet@^1.7.1:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -9935,7 +9958,12 @@ vue-router@3.1.6:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.6.tgz#45f5a3a3843e31702c061dd829393554e4328f89"
   integrity sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA==
 
-vue-select@^3.18.3, vue-select@^3.4.0:
+vue-select@3.20.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.20.2.tgz#eaa15012b032c154d4fb51ac82ebeda2beeae54b"
+  integrity sha512-ZSzIDzyYsWZULGUxVp1h6u3yi9IZQBWX8r6kSudUI/I5J1HQKpBjRntvkrg6pr87xmm16kdChvHCDN+W84vTKw==
+
+vue-select@^3.18.3:
   version "3.18.3"
   resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.18.3.tgz#31f188d7181a4a86d07b937303c457efe863c4bc"
   integrity sha512-nKmwxEDO4RRoZ6lWkkVE2bpgne7IJSRzSh1pIawLI7dJLZbtJuSgA0xGaLrT0pUp+JYHBDul242PwOBDHi28vg==
@@ -9983,6 +10011,11 @@ vue2-ace-editor@^0.0.15:
   dependencies:
     brace "^0.11.0"
 
+vue2-leaflet@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
+  integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
+
 vue@2.6.14, vue@^2.6.12:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
diff --git a/client/web/privacy/package.json b/client/web/privacy/package.json
index 8ed89c18e..129a2171c 100644
--- a/client/web/privacy/package.json
+++ b/client/web/privacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corteza-privacy",
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -15,8 +15,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.1",
-    "@cortezaproject/corteza-vue": "^2023.9.1",
+    "@cortezaproject/corteza-js": "^2023.9.2-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.2-rc.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.21",
     "@fortawesome/free-regular-svg-icons": "^5.10.1",
     "@fortawesome/free-solid-svg-icons": "^5.10.1",
diff --git a/client/web/privacy/yarn.lock b/client/web/privacy/yarn.lock
index 4e17f454b..01f9fe595 100644
--- a/client/web/privacy/yarn.lock
+++ b/client/web/privacy/yarn.lock
@@ -954,10 +954,10 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.1.tgz#c3e81a4baee397902dff39d4efb5056539d671d3"
-  integrity sha512-NZpiWlBflkM6gPSOUIAYv0zT1URKNjBkzOytXDO03AAldjNOSZdc4cVfFk4bv3r7DrYu7XsyhKjYqTtgtRNt7A==
+"@cortezaproject/corteza-js@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.2-rc.1.tgz#1b3b77c3c2da262f951ec10d2e68c4b72666fe8a"
+  integrity sha512-J1zfuu9WxkvUK4pDlgbcQgsaqGCbXXYmvnbUi+rbh43WZRtWo1rVyVBSw3H6ZhYGdggb2CASDhMfh+qLS2D/Ig==
   dependencies:
     axios "^0.21.1"
     hex-rgb "^4.1.0"
@@ -968,12 +968,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.1.tgz#93be18a82750bb7954483f254b44d88a5941f5de"
-  integrity sha512-qDfnvUx+wd7ZmrbaKPuzD8RSAFCzonSZSnVBW2KCWLZc6ktpNjNF/UezNl2/UqgRoD/6NlP7BcGiQiQnOTIl2w==
+"@cortezaproject/corteza-vue@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.2-rc.1.tgz#ad659ac9152c336ebb9dfef986f28485354e1033"
+  integrity sha512-Ss1c8FXSO234CG47bRu/W00oB/U3TBDOtjiOM2mUzfsDNymuBxJ8HNL1RXbJm5lZ4il4IsvcNKVD0Ny4/JSTKg==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.1"
+    "@cortezaproject/corteza-js" "^2023.9.2-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -990,6 +990,8 @@
     i18next-http-backend "^1.3.0"
     i18next-multiload-backend-adapter "^1.0.0"
     kind-of "^6.0.3"
+    leaflet "^1.7.1"
+    leaflet-geosearch "^3.7.0"
     lodash "^4.17.21"
     moment "2.29.2"
     numeral "^2.0.6"
@@ -1002,9 +1004,10 @@
     v-photoswipe "^1.0.3-1"
     vue-color "^2.8.1"
     vue-echarts "^6.2.3"
-    vue-select "^3.4.0"
+    vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
+    vue2-leaflet "^2.7.1"
     vuedraggable "^2.23.0"
     vuex "^3.6.2"
     websocket-extensions "^0.1.4"
@@ -1065,6 +1068,13 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz#eeeec1e4e8850bed0468f938292b06cda793bf34"
   integrity sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==
 
+"@googlemaps/js-api-loader@^1.14.3":
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.16.2.tgz#3fe748e21243f8e8322c677a5525c569ae9cdbe9"
+  integrity sha512-psGw5u0QM6humao48Hn4lrChOM2/rA43ZCm3tKK9qQsEj1/VzqkCqnvGfEOshDbBQflydfaRovbKwZMF4AyqbA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -4978,7 +4988,7 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
   integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -6964,6 +6974,19 @@ launch-editor@^2.2.1, launch-editor@^2.3.0:
     picocolors "^1.0.0"
     shell-quote "^1.6.1"
 
+leaflet-geosearch@^3.7.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/leaflet-geosearch/-/leaflet-geosearch-3.11.0.tgz#d35e7837cfb880da49ae9807ef9e0a4487b4d6eb"
+  integrity sha512-lWmryKXg7S//7q53fMyooCAyAzYxMtozeEmjrQqtkmsPmeHphaKMuFEm/uD4ZwoblBIIMXsUnuNBLvg6bSfjqA==
+  optionalDependencies:
+    "@googlemaps/js-api-loader" "^1.14.3"
+    leaflet "^1.6.0"
+
+leaflet@^1.6.0, leaflet@^1.7.1:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -11605,10 +11628,10 @@ vue-router@3.1.5:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.5.tgz#ff29b8a1e1306c526b52d4dc0532109f16c41231"
   integrity sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg==
 
-vue-select@^3.4.0:
-  version "3.18.3"
-  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.18.3.tgz#31f188d7181a4a86d07b937303c457efe863c4bc"
-  integrity sha512-nKmwxEDO4RRoZ6lWkkVE2bpgne7IJSRzSh1pIawLI7dJLZbtJuSgA0xGaLrT0pUp+JYHBDul242PwOBDHi28vg==
+vue-select@3.20.2, vue-select@^3.12.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.20.2.tgz#eaa15012b032c154d4fb51ac82ebeda2beeae54b"
+  integrity sha512-ZSzIDzyYsWZULGUxVp1h6u3yi9IZQBWX8r6kSudUI/I5J1HQKpBjRntvkrg6pr87xmm16kdChvHCDN+W84vTKw==
 
 vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
   version "4.1.3"
@@ -11643,6 +11666,11 @@ vue2-ace-editor@^0.0.15:
   dependencies:
     brace "^0.11.0"
 
+vue2-leaflet@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
+  integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
+
 vue@2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
diff --git a/client/web/reporter/package.json b/client/web/reporter/package.json
index 5d7d37290..257a7930d 100644
--- a/client/web/reporter/package.json
+++ b/client/web/reporter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corteza-reporter",
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -15,8 +15,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.1",
-    "@cortezaproject/corteza-vue": "^2023.9.1",
+    "@cortezaproject/corteza-js": "^2023.9.2-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.2-rc.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.21",
     "@fortawesome/free-regular-svg-icons": "^5.10.1",
     "@fortawesome/free-solid-svg-icons": "^5.10.1",
diff --git a/client/web/reporter/yarn.lock b/client/web/reporter/yarn.lock
index b6c3d5b39..77dedd354 100644
--- a/client/web/reporter/yarn.lock
+++ b/client/web/reporter/yarn.lock
@@ -954,10 +954,10 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.1.tgz#c3e81a4baee397902dff39d4efb5056539d671d3"
-  integrity sha512-NZpiWlBflkM6gPSOUIAYv0zT1URKNjBkzOytXDO03AAldjNOSZdc4cVfFk4bv3r7DrYu7XsyhKjYqTtgtRNt7A==
+"@cortezaproject/corteza-js@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.2-rc.1.tgz#1b3b77c3c2da262f951ec10d2e68c4b72666fe8a"
+  integrity sha512-J1zfuu9WxkvUK4pDlgbcQgsaqGCbXXYmvnbUi+rbh43WZRtWo1rVyVBSw3H6ZhYGdggb2CASDhMfh+qLS2D/Ig==
   dependencies:
     axios "^0.21.1"
     hex-rgb "^4.1.0"
@@ -968,12 +968,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.1.tgz#93be18a82750bb7954483f254b44d88a5941f5de"
-  integrity sha512-qDfnvUx+wd7ZmrbaKPuzD8RSAFCzonSZSnVBW2KCWLZc6ktpNjNF/UezNl2/UqgRoD/6NlP7BcGiQiQnOTIl2w==
+"@cortezaproject/corteza-vue@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.2-rc.1.tgz#ad659ac9152c336ebb9dfef986f28485354e1033"
+  integrity sha512-Ss1c8FXSO234CG47bRu/W00oB/U3TBDOtjiOM2mUzfsDNymuBxJ8HNL1RXbJm5lZ4il4IsvcNKVD0Ny4/JSTKg==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.1"
+    "@cortezaproject/corteza-js" "^2023.9.2-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -990,6 +990,8 @@
     i18next-http-backend "^1.3.0"
     i18next-multiload-backend-adapter "^1.0.0"
     kind-of "^6.0.3"
+    leaflet "^1.7.1"
+    leaflet-geosearch "^3.7.0"
     lodash "^4.17.21"
     moment "2.29.2"
     numeral "^2.0.6"
@@ -1002,9 +1004,10 @@
     v-photoswipe "^1.0.3-1"
     vue-color "^2.8.1"
     vue-echarts "^6.2.3"
-    vue-select "^3.4.0"
+    vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
+    vue2-leaflet "^2.7.1"
     vuedraggable "^2.23.0"
     vuex "^3.6.2"
     websocket-extensions "^0.1.4"
@@ -1065,6 +1068,13 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz#eeeec1e4e8850bed0468f938292b06cda793bf34"
   integrity sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==
 
+"@googlemaps/js-api-loader@^1.14.3":
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.16.2.tgz#3fe748e21243f8e8322c677a5525c569ae9cdbe9"
+  integrity sha512-psGw5u0QM6humao48Hn4lrChOM2/rA43ZCm3tKK9qQsEj1/VzqkCqnvGfEOshDbBQflydfaRovbKwZMF4AyqbA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -4985,7 +4995,7 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
   integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -6966,6 +6976,19 @@ launch-editor@^2.2.1, launch-editor@^2.3.0:
     picocolors "^1.0.0"
     shell-quote "^1.6.1"
 
+leaflet-geosearch@^3.7.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/leaflet-geosearch/-/leaflet-geosearch-3.11.0.tgz#d35e7837cfb880da49ae9807ef9e0a4487b4d6eb"
+  integrity sha512-lWmryKXg7S//7q53fMyooCAyAzYxMtozeEmjrQqtkmsPmeHphaKMuFEm/uD4ZwoblBIIMXsUnuNBLvg6bSfjqA==
+  optionalDependencies:
+    "@googlemaps/js-api-loader" "^1.14.3"
+    leaflet "^1.6.0"
+
+leaflet@^1.6.0, leaflet@^1.7.1:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -11609,10 +11632,10 @@ vue-router@3.1.5:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.5.tgz#ff29b8a1e1306c526b52d4dc0532109f16c41231"
   integrity sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg==
 
-vue-select@^3.4.0:
-  version "3.18.3"
-  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.18.3.tgz#31f188d7181a4a86d07b937303c457efe863c4bc"
-  integrity sha512-nKmwxEDO4RRoZ6lWkkVE2bpgne7IJSRzSh1pIawLI7dJLZbtJuSgA0xGaLrT0pUp+JYHBDul242PwOBDHi28vg==
+vue-select@3.20.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.20.2.tgz#eaa15012b032c154d4fb51ac82ebeda2beeae54b"
+  integrity sha512-ZSzIDzyYsWZULGUxVp1h6u3yi9IZQBWX8r6kSudUI/I5J1HQKpBjRntvkrg6pr87xmm16kdChvHCDN+W84vTKw==
 
 vue-split-panel@^1.0.4:
   version "1.0.4"
@@ -11659,6 +11682,11 @@ vue2-ace-editor@^0.0.15:
   dependencies:
     brace "^0.11.0"
 
+vue2-leaflet@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
+  integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
+
 vue@2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
diff --git a/client/web/workflow/package.json b/client/web/workflow/package.json
index e5dd2021a..5950bf093 100644
--- a/client/web/workflow/package.json
+++ b/client/web/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corteza-workflow",
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "scripts": {
     "serve": "vue-cli-service serve",
     "dev-env": "vue-cli-service serve src/dev-env.js",
@@ -14,8 +14,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.1",
-    "@cortezaproject/corteza-vue": "^2023.9.1",
+    "@cortezaproject/corteza-js": "^2023.9.2-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.2-rc.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.21",
     "@fortawesome/free-regular-svg-icons": "^5.10.1",
     "@fortawesome/free-solid-svg-icons": "^5.10.1",
diff --git a/client/web/workflow/yarn.lock b/client/web/workflow/yarn.lock
index aafa83e74..ff0db58ad 100644
--- a/client/web/workflow/yarn.lock
+++ b/client/web/workflow/yarn.lock
@@ -1064,10 +1064,10 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.1.tgz#c3e81a4baee397902dff39d4efb5056539d671d3"
-  integrity sha512-NZpiWlBflkM6gPSOUIAYv0zT1URKNjBkzOytXDO03AAldjNOSZdc4cVfFk4bv3r7DrYu7XsyhKjYqTtgtRNt7A==
+"@cortezaproject/corteza-js@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.2-rc.1.tgz#1b3b77c3c2da262f951ec10d2e68c4b72666fe8a"
+  integrity sha512-J1zfuu9WxkvUK4pDlgbcQgsaqGCbXXYmvnbUi+rbh43WZRtWo1rVyVBSw3H6ZhYGdggb2CASDhMfh+qLS2D/Ig==
   dependencies:
     axios "^0.21.1"
     hex-rgb "^4.1.0"
@@ -1078,12 +1078,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.1.tgz#93be18a82750bb7954483f254b44d88a5941f5de"
-  integrity sha512-qDfnvUx+wd7ZmrbaKPuzD8RSAFCzonSZSnVBW2KCWLZc6ktpNjNF/UezNl2/UqgRoD/6NlP7BcGiQiQnOTIl2w==
+"@cortezaproject/corteza-vue@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.2-rc.1.tgz#ad659ac9152c336ebb9dfef986f28485354e1033"
+  integrity sha512-Ss1c8FXSO234CG47bRu/W00oB/U3TBDOtjiOM2mUzfsDNymuBxJ8HNL1RXbJm5lZ4il4IsvcNKVD0Ny4/JSTKg==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.1"
+    "@cortezaproject/corteza-js" "^2023.9.2-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -1100,6 +1100,8 @@
     i18next-http-backend "^1.3.0"
     i18next-multiload-backend-adapter "^1.0.0"
     kind-of "^6.0.3"
+    leaflet "^1.7.1"
+    leaflet-geosearch "^3.7.0"
     lodash "^4.17.21"
     moment "2.29.2"
     numeral "^2.0.6"
@@ -1112,9 +1114,10 @@
     v-photoswipe "^1.0.3-1"
     vue-color "^2.8.1"
     vue-echarts "^6.2.3"
-    vue-select "^3.4.0"
+    vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
+    vue2-leaflet "^2.7.1"
     vuedraggable "^2.23.0"
     vuex "^3.6.2"
     websocket-extensions "^0.1.4"
@@ -1175,6 +1178,13 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz#eeeec1e4e8850bed0468f938292b06cda793bf34"
   integrity sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==
 
+"@googlemaps/js-api-loader@^1.14.3":
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.16.2.tgz#3fe748e21243f8e8322c677a5525c569ae9cdbe9"
+  integrity sha512-psGw5u0QM6humao48Hn4lrChOM2/rA43ZCm3tKK9qQsEj1/VzqkCqnvGfEOshDbBQflydfaRovbKwZMF4AyqbA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@@ -5029,7 +5039,7 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -7010,6 +7020,19 @@ launch-editor@^2.2.1:
     chalk "^2.3.0"
     shell-quote "^1.6.1"
 
+leaflet-geosearch@^3.7.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/leaflet-geosearch/-/leaflet-geosearch-3.11.0.tgz#d35e7837cfb880da49ae9807ef9e0a4487b4d6eb"
+  integrity sha512-lWmryKXg7S//7q53fMyooCAyAzYxMtozeEmjrQqtkmsPmeHphaKMuFEm/uD4ZwoblBIIMXsUnuNBLvg6bSfjqA==
+  optionalDependencies:
+    "@googlemaps/js-api-loader" "^1.14.3"
+    leaflet "^1.6.0"
+
+leaflet@^1.6.0, leaflet@^1.7.1:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -11756,10 +11779,10 @@ vue-router@3.1.5:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.5.tgz#ff29b8a1e1306c526b52d4dc0532109f16c41231"
   integrity sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg==
 
-vue-select@^3.4.0:
-  version "3.18.3"
-  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.18.3.tgz#31f188d7181a4a86d07b937303c457efe863c4bc"
-  integrity sha512-nKmwxEDO4RRoZ6lWkkVE2bpgne7IJSRzSh1pIawLI7dJLZbtJuSgA0xGaLrT0pUp+JYHBDul242PwOBDHi28vg==
+vue-select@3.20.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.20.2.tgz#eaa15012b032c154d4fb51ac82ebeda2beeae54b"
+  integrity sha512-ZSzIDzyYsWZULGUxVp1h6u3yi9IZQBWX8r6kSudUI/I5J1HQKpBjRntvkrg6pr87xmm16kdChvHCDN+W84vTKw==
 
 vue-style-loader@^4.1.0:
   version "4.1.2"
@@ -11802,6 +11825,11 @@ vue2-ace-editor@^0.0.15:
   dependencies:
     brace "^0.11.0"
 
+vue2-leaflet@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
+  integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
+
 vue@2.6.14:
   version "2.6.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
diff --git a/lib/js/package.json b/lib/js/package.json
index 27cc9e17c..b87fde466 100644
--- a/lib/js/package.json
+++ b/lib/js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cortezaproject/corteza-js",
   "description": "Corteza JavaScript/TypeScript libs",
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "license": "Apache-2.0",
   "author": "Denis Arh <denis.arh@crust.tech>",
   "main": "dist/index.js",
diff --git a/lib/vue/package.json b/lib/vue/package.json
index f5fe7bfed..b6968391d 100644
--- a/lib/vue/package.json
+++ b/lib/vue/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cortezaproject/corteza-vue",
   "description": "Corteza Vue.js JavaScript/TypeScript libs",
-  "version": "2023.9.1",
+  "version": "2023.9.2-rc.1",
   "license": "Apache-2.0",
   "author": "Denis Arh <denis.arh@crust.tech>",
   "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.1",
+    "@cortezaproject/corteza-js": "^2023.9.2-rc.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.26",
     "@fortawesome/free-solid-svg-icons": "^5.12.0",
     "@fortawesome/vue-fontawesome": "^0.1.9",
diff --git a/lib/vue/yarn.lock b/lib/vue/yarn.lock
index 31d4aa9da..16fa651fd 100644
--- a/lib/vue/yarn.lock
+++ b/lib/vue/yarn.lock
@@ -923,10 +923,10 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.1":
-  version "2023.9.1"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.1.tgz#c3e81a4baee397902dff39d4efb5056539d671d3"
-  integrity sha512-NZpiWlBflkM6gPSOUIAYv0zT1URKNjBkzOytXDO03AAldjNOSZdc4cVfFk4bv3r7DrYu7XsyhKjYqTtgtRNt7A==
+"@cortezaproject/corteza-js@^2023.9.2-rc.1":
+  version "2023.9.2-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.2-rc.1.tgz#1b3b77c3c2da262f951ec10d2e68c4b72666fe8a"
+  integrity sha512-J1zfuu9WxkvUK4pDlgbcQgsaqGCbXXYmvnbUi+rbh43WZRtWo1rVyVBSw3H6ZhYGdggb2CASDhMfh+qLS2D/Ig==
   dependencies:
     axios "^0.21.1"
     hex-rgb "^4.1.0"