diff --git a/client/web/admin/package.json b/client/web/admin/package.json
index dd17a5297..668616214 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.6-b",
+  "version": "2023.9.7-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.6-b",
-    "@cortezaproject/corteza-vue": "^2023.9.6-b",
+    "@cortezaproject/corteza-js": "^2023.9.7-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.7-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 703be56fa..653cb94e9 100644
--- a/client/web/admin/yarn.lock
+++ b/client/web/admin/yarn.lock
@@ -774,10 +774,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.6-b.tgz#44de2d07cb51cb4c54d5500e582839e5c08a7c28"
-  integrity sha512-xNeVxw2lnNtAa7ZxOWKlhh//fwS/ZafYa4Uc5T6MijgqBLFU4lLlIAFqEa62cfSbc+b5yY2Hh0QOQGVVEaSgdQ==
+"@cortezaproject/corteza-js@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.7-rc.1.tgz#b6bd5ba37f1cd9a0e7ad64e74c694e7aa3293347"
+  integrity sha512-41kqlyHjfVXZSh19sySJXWZA+lG84ENEhK8Nnpf+7cd0IS7lyMtmf7Q/W/FGfJXc1Mr9bqbbRvroONaCGwBjBQ==
   dependencies:
     axios "^0.28.0"
     hex-rgb "^4.1.0"
@@ -788,12 +788,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.6-b.tgz#e9e3642d0218bb848475a3a9bfab01b0626554af"
-  integrity sha512-npMCkURGF1uDyZjaHkY7q3rI28iYlAYGjaVOQPONxyVc5+l0eP3MVIDxmdDq8y2y9k1Cdnwg1PRAJuYElNApLg==
+"@cortezaproject/corteza-vue@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.7-rc.1.tgz#8c4c08e7912ad4da8f09952de8a7471644147ee0"
+  integrity sha512-BopFmWsSyHbsodX97E8ktmjCtdR4+GlR0J2HDLsItqyyyFEOnfoyDn6ShMrxa3OiPlf/13YFr4iKuzMHq0YezA==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.6-b"
+    "@cortezaproject/corteza-js" "^2023.9.7-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -801,7 +801,6 @@
     "@popperjs/core" "^2.11.2"
     acorn "^7.3.1"
     bootstrap-vue "2.23.1"
-    echarts "^5.3.3"
     fuzzysort "^1.2.1"
     highlight.js "^10.4.1"
     html-parse-stringify "^3.0.1"
@@ -822,8 +821,8 @@
     tiptap "^1.26.0"
     tiptap-extensions "^1.28.4"
     v-photoswipe "^1.0.3-1"
+    vue "2.6.14"
     vue-color "^2.8.1"
-    vue-echarts "^6.2.3"
     vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
@@ -4026,14 +4025,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.3.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.4.3.tgz#f5522ef24419164903eedcfd2b506c6fc91fb20c"
-  integrity sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==
-  dependencies:
-    tslib "2.3.0"
-    zrender "5.4.4"
-
 editorconfig@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-1.0.4.tgz#040c9a8e9a6c5288388b87c2db07028aa89f53a3"
@@ -9674,11 +9665,6 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==
 
-resize-detector@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/resize-detector/-/resize-detector-0.3.0.tgz#fe495112e184695500a8f51e0389f15774cb1cfc"
-  integrity sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11224,11 +11210,6 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -11710,19 +11691,6 @@ vue-color@^2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
-vue-demi@^0.13.11:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
-  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
-
-vue-echarts@^6.2.3:
-  version "6.6.8"
-  resolved "https://registry.yarnpkg.com/vue-echarts/-/vue-echarts-6.6.8.tgz#e00c2a0fcb39681fbb41e0afacbe88aef7e80f24"
-  integrity sha512-3EGrxKGCGjHnkhudRQQ4fkK5iJxxXNQ1fXvSWA/7mzR/oV7BBSHYvC3gDbG/WIW0A/Fcx2H8k5H3NDyWgjyi8g==
-  dependencies:
-    resize-detector "^0.3.0"
-    vue-demi "^0.13.11"
-
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
@@ -12363,10 +12331,3 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
-
-zrender@5.4.4:
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.4.4.tgz#8854f1d95ecc82cf8912f5a11f86657cb8c9e261"
-  integrity sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==
-  dependencies:
-    tslib "2.3.0"
diff --git a/client/web/compose/package.json b/client/web/compose/package.json
index 0ecec612e..f5b023e25 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.6-b",
+  "version": "2023.9.7-rc.1",
   "license": "Apache-2.0",
   "contributors": [
     "Denis Arh <denis.arh@gmail.com>"
@@ -32,8 +32,8 @@
     }
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.6-b",
-    "@cortezaproject/corteza-vue": "^2023.9.6-b",
+    "@cortezaproject/corteza-js": "^2023.9.7-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.7-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 dc763967b..c420d8265 100644
--- a/client/web/compose/yarn.lock
+++ b/client/web/compose/yarn.lock
@@ -706,10 +706,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.6-b.tgz#44de2d07cb51cb4c54d5500e582839e5c08a7c28"
-  integrity sha512-xNeVxw2lnNtAa7ZxOWKlhh//fwS/ZafYa4Uc5T6MijgqBLFU4lLlIAFqEa62cfSbc+b5yY2Hh0QOQGVVEaSgdQ==
+"@cortezaproject/corteza-js@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.7-rc.1.tgz#b6bd5ba37f1cd9a0e7ad64e74c694e7aa3293347"
+  integrity sha512-41kqlyHjfVXZSh19sySJXWZA+lG84ENEhK8Nnpf+7cd0IS7lyMtmf7Q/W/FGfJXc1Mr9bqbbRvroONaCGwBjBQ==
   dependencies:
     axios "^0.28.0"
     hex-rgb "^4.1.0"
@@ -720,12 +720,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.6-b.tgz#e9e3642d0218bb848475a3a9bfab01b0626554af"
-  integrity sha512-npMCkURGF1uDyZjaHkY7q3rI28iYlAYGjaVOQPONxyVc5+l0eP3MVIDxmdDq8y2y9k1Cdnwg1PRAJuYElNApLg==
+"@cortezaproject/corteza-vue@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.7-rc.1.tgz#8c4c08e7912ad4da8f09952de8a7471644147ee0"
+  integrity sha512-BopFmWsSyHbsodX97E8ktmjCtdR4+GlR0J2HDLsItqyyyFEOnfoyDn6ShMrxa3OiPlf/13YFr4iKuzMHq0YezA==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.6-b"
+    "@cortezaproject/corteza-js" "^2023.9.7-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -733,7 +733,6 @@
     "@popperjs/core" "^2.11.2"
     acorn "^7.3.1"
     bootstrap-vue "2.23.1"
-    echarts "^5.3.3"
     fuzzysort "^1.2.1"
     highlight.js "^10.4.1"
     html-parse-stringify "^3.0.1"
@@ -754,8 +753,8 @@
     tiptap "^1.26.0"
     tiptap-extensions "^1.28.4"
     v-photoswipe "^1.0.3-1"
+    vue "2.6.14"
     vue-color "^2.8.1"
-    vue-echarts "^6.2.3"
     vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
@@ -4402,14 +4401,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.3.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.4.3.tgz#f5522ef24419164903eedcfd2b506c6fc91fb20c"
-  integrity sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==
-  dependencies:
-    tslib "2.3.0"
-    zrender "5.4.4"
-
 editorconfig@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-1.0.4.tgz#040c9a8e9a6c5288388b87c2db07028aa89f53a3"
@@ -10348,11 +10339,6 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha512-b/6tFZCmRhtBMa4xGqiiRp9jh9Aqi2A687Lo265cN0/QohJQEBPiQ52f4QB6i0eF3yp3hmLL21LSGBcML2dlxA==
 
-resize-detector@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/resize-detector/-/resize-detector-0.3.0.tgz#fe495112e184695500a8f51e0389f15774cb1cfc"
-  integrity sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11899,11 +11885,6 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -12373,19 +12354,6 @@ vue-color@^2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
-vue-demi@^0.13.11:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
-  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
-
-vue-echarts@^6.2.3:
-  version "6.6.8"
-  resolved "https://registry.yarnpkg.com/vue-echarts/-/vue-echarts-6.6.8.tgz#e00c2a0fcb39681fbb41e0afacbe88aef7e80f24"
-  integrity sha512-3EGrxKGCGjHnkhudRQQ4fkK5iJxxXNQ1fXvSWA/7mzR/oV7BBSHYvC3gDbG/WIW0A/Fcx2H8k5H3NDyWgjyi8g==
-  dependencies:
-    resize-detector "^0.3.0"
-    vue-demi "^0.13.11"
-
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
@@ -13058,10 +13026,3 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
-
-zrender@5.4.4:
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.4.4.tgz#8854f1d95ecc82cf8912f5a11f86657cb8c9e261"
-  integrity sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==
-  dependencies:
-    tslib "2.3.0"
diff --git a/client/web/discovery/package.json b/client/web/discovery/package.json
index 685f2cee2..0b212ea3a 100644
--- a/client/web/discovery/package.json
+++ b/client/web/discovery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corteza-discovery",
-  "version": "2023.9.6-b",
+  "version": "2023.9.7-rc.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -15,8 +15,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.6-b",
-    "@cortezaproject/corteza-vue": "^2023.9.6-b",
+    "@cortezaproject/corteza-js": "^2023.9.7-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.7-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 ef82d2ca0..ef5d808d4 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.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.6-b.tgz#44de2d07cb51cb4c54d5500e582839e5c08a7c28"
-  integrity sha512-xNeVxw2lnNtAa7ZxOWKlhh//fwS/ZafYa4Uc5T6MijgqBLFU4lLlIAFqEa62cfSbc+b5yY2Hh0QOQGVVEaSgdQ==
+"@cortezaproject/corteza-js@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.7-rc.1.tgz#b6bd5ba37f1cd9a0e7ad64e74c694e7aa3293347"
+  integrity sha512-41kqlyHjfVXZSh19sySJXWZA+lG84ENEhK8Nnpf+7cd0IS7lyMtmf7Q/W/FGfJXc1Mr9bqbbRvroONaCGwBjBQ==
   dependencies:
     axios "^0.28.0"
     hex-rgb "^4.1.0"
@@ -988,12 +988,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.6-b.tgz#e9e3642d0218bb848475a3a9bfab01b0626554af"
-  integrity sha512-npMCkURGF1uDyZjaHkY7q3rI28iYlAYGjaVOQPONxyVc5+l0eP3MVIDxmdDq8y2y9k1Cdnwg1PRAJuYElNApLg==
+"@cortezaproject/corteza-vue@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.7-rc.1.tgz#8c4c08e7912ad4da8f09952de8a7471644147ee0"
+  integrity sha512-BopFmWsSyHbsodX97E8ktmjCtdR4+GlR0J2HDLsItqyyyFEOnfoyDn6ShMrxa3OiPlf/13YFr4iKuzMHq0YezA==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.6-b"
+    "@cortezaproject/corteza-js" "^2023.9.7-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -1001,7 +1001,6 @@
     "@popperjs/core" "^2.11.2"
     acorn "^7.3.1"
     bootstrap-vue "2.23.1"
-    echarts "^5.3.3"
     fuzzysort "^1.2.1"
     highlight.js "^10.4.1"
     html-parse-stringify "^3.0.1"
@@ -1022,8 +1021,8 @@
     tiptap "^1.26.0"
     tiptap-extensions "^1.28.4"
     v-photoswipe "^1.0.3-1"
+    vue "2.6.14"
     vue-color "^2.8.1"
-    vue-echarts "^6.2.3"
     vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
@@ -4473,14 +4472,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.3.tgz#df97b09c4c0e2ffcdfb44acf518d50c50e0b838e"
-  integrity sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==
-  dependencies:
-    tslib "2.3.0"
-    zrender "5.3.2"
-
 editorconfig@^0.15.3:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
@@ -10338,11 +10329,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-resize-detector@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/resize-detector/-/resize-detector-0.3.0.tgz#fe495112e184695500a8f51e0389f15774cb1cfc"
-  integrity sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11850,11 +11836,6 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -12292,19 +12273,6 @@ vue-color@^2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
-vue-demi@^0.13.2:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
-  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
-
-vue-echarts@^6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/vue-echarts/-/vue-echarts-6.2.3.tgz#77973c417a56bca76847576ab903ab92979d75bb"
-  integrity sha512-xHzUvgsgk/asJTcNa8iVVwoovZU3iEUHvmBa3bzbiP3Y6OMxM1YXsoWOKVmVVaUusGs4ob4pSwjwNy2FemAz9w==
-  dependencies:
-    resize-detector "^0.3.0"
-    vue-demi "^0.13.2"
-
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
@@ -12935,10 +12903,3 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
-
-zrender@5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.3.2.tgz#f67b11d36d3d020d62411d3bb123eb1c93cccd69"
-  integrity sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==
-  dependencies:
-    tslib "2.3.0"
diff --git a/client/web/one/package.json b/client/web/one/package.json
index 14052e073..f9a0353d5 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.6-b",
+  "version": "2023.9.7-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.6-b",
-    "@cortezaproject/corteza-vue": "^2023.9.6-b",
+    "@cortezaproject/corteza-js": "^2023.9.7-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.7-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 1225fa6f3..0cc975d13 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.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.6-b.tgz#44de2d07cb51cb4c54d5500e582839e5c08a7c28"
-  integrity sha512-xNeVxw2lnNtAa7ZxOWKlhh//fwS/ZafYa4Uc5T6MijgqBLFU4lLlIAFqEa62cfSbc+b5yY2Hh0QOQGVVEaSgdQ==
+"@cortezaproject/corteza-js@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.7-rc.1.tgz#b6bd5ba37f1cd9a0e7ad64e74c694e7aa3293347"
+  integrity sha512-41kqlyHjfVXZSh19sySJXWZA+lG84ENEhK8Nnpf+7cd0IS7lyMtmf7Q/W/FGfJXc1Mr9bqbbRvroONaCGwBjBQ==
   dependencies:
     axios "^0.28.0"
     hex-rgb "^4.1.0"
@@ -689,12 +689,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.6-b.tgz#e9e3642d0218bb848475a3a9bfab01b0626554af"
-  integrity sha512-npMCkURGF1uDyZjaHkY7q3rI28iYlAYGjaVOQPONxyVc5+l0eP3MVIDxmdDq8y2y9k1Cdnwg1PRAJuYElNApLg==
+"@cortezaproject/corteza-vue@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.7-rc.1.tgz#8c4c08e7912ad4da8f09952de8a7471644147ee0"
+  integrity sha512-BopFmWsSyHbsodX97E8ktmjCtdR4+GlR0J2HDLsItqyyyFEOnfoyDn6ShMrxa3OiPlf/13YFr4iKuzMHq0YezA==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.6-b"
+    "@cortezaproject/corteza-js" "^2023.9.7-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -702,7 +702,6 @@
     "@popperjs/core" "^2.11.2"
     acorn "^7.3.1"
     bootstrap-vue "2.23.1"
-    echarts "^5.3.3"
     fuzzysort "^1.2.1"
     highlight.js "^10.4.1"
     html-parse-stringify "^3.0.1"
@@ -723,8 +722,8 @@
     tiptap "^1.26.0"
     tiptap-extensions "^1.28.4"
     v-photoswipe "^1.0.3-1"
+    vue "2.6.14"
     vue-color "^2.8.1"
-    vue-echarts "^6.2.3"
     vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
@@ -3588,14 +3587,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.3.tgz#df97b09c4c0e2ffcdfb44acf518d50c50e0b838e"
-  integrity sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==
-  dependencies:
-    tslib "2.3.0"
-    zrender "5.3.2"
-
 editorconfig@^0.15.3:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
@@ -8655,11 +8646,6 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
-resize-detector@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/resize-detector/-/resize-detector-0.3.0.tgz#fe495112e184695500a8f51e0389f15774cb1cfc"
-  integrity sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -9919,11 +9905,6 @@ tsconfig-paths@^3.9.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -10232,19 +10213,6 @@ vue-color@^2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
-vue-demi@^0.13.2:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
-  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
-
-vue-echarts@^6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/vue-echarts/-/vue-echarts-6.2.3.tgz#77973c417a56bca76847576ab903ab92979d75bb"
-  integrity sha512-xHzUvgsgk/asJTcNa8iVVwoovZU3iEUHvmBa3bzbiP3Y6OMxM1YXsoWOKVmVVaUusGs4ob4pSwjwNy2FemAz9w==
-  dependencies:
-    resize-detector "^0.3.0"
-    vue-demi "^0.13.2"
-
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
@@ -10867,10 +10835,3 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
-
-zrender@5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.3.2.tgz#f67b11d36d3d020d62411d3bb123eb1c93cccd69"
-  integrity sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==
-  dependencies:
-    tslib "2.3.0"
diff --git a/client/web/privacy/package.json b/client/web/privacy/package.json
index adc48210a..103bde7a6 100644
--- a/client/web/privacy/package.json
+++ b/client/web/privacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corteza-privacy",
-  "version": "2023.9.6-b",
+  "version": "2023.9.7-rc.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -15,8 +15,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.6-b",
-    "@cortezaproject/corteza-vue": "^2023.9.6-b",
+    "@cortezaproject/corteza-js": "^2023.9.7-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.7-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 21de805e8..eb74ff13e 100644
--- a/client/web/privacy/yarn.lock
+++ b/client/web/privacy/yarn.lock
@@ -1057,10 +1057,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.6-b.tgz#44de2d07cb51cb4c54d5500e582839e5c08a7c28"
-  integrity sha512-xNeVxw2lnNtAa7ZxOWKlhh//fwS/ZafYa4Uc5T6MijgqBLFU4lLlIAFqEa62cfSbc+b5yY2Hh0QOQGVVEaSgdQ==
+"@cortezaproject/corteza-js@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.7-rc.1.tgz#b6bd5ba37f1cd9a0e7ad64e74c694e7aa3293347"
+  integrity sha512-41kqlyHjfVXZSh19sySJXWZA+lG84ENEhK8Nnpf+7cd0IS7lyMtmf7Q/W/FGfJXc1Mr9bqbbRvroONaCGwBjBQ==
   dependencies:
     axios "^0.28.0"
     hex-rgb "^4.1.0"
@@ -1071,12 +1071,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.6-b.tgz#e9e3642d0218bb848475a3a9bfab01b0626554af"
-  integrity sha512-npMCkURGF1uDyZjaHkY7q3rI28iYlAYGjaVOQPONxyVc5+l0eP3MVIDxmdDq8y2y9k1Cdnwg1PRAJuYElNApLg==
+"@cortezaproject/corteza-vue@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.7-rc.1.tgz#8c4c08e7912ad4da8f09952de8a7471644147ee0"
+  integrity sha512-BopFmWsSyHbsodX97E8ktmjCtdR4+GlR0J2HDLsItqyyyFEOnfoyDn6ShMrxa3OiPlf/13YFr4iKuzMHq0YezA==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.6-b"
+    "@cortezaproject/corteza-js" "^2023.9.7-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -1084,7 +1084,6 @@
     "@popperjs/core" "^2.11.2"
     acorn "^7.3.1"
     bootstrap-vue "2.23.1"
-    echarts "^5.3.3"
     fuzzysort "^1.2.1"
     highlight.js "^10.4.1"
     html-parse-stringify "^3.0.1"
@@ -1105,8 +1104,8 @@
     tiptap "^1.26.0"
     tiptap-extensions "^1.28.4"
     v-photoswipe "^1.0.3-1"
+    vue "2.6.14"
     vue-color "^2.8.1"
-    vue-echarts "^6.2.3"
     vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
@@ -4566,14 +4565,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.3.tgz#df97b09c4c0e2ffcdfb44acf518d50c50e0b838e"
-  integrity sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==
-  dependencies:
-    tslib "2.3.0"
-    zrender "5.3.2"
-
 editorconfig@^0.15.3:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
@@ -10286,11 +10277,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-resize-detector@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/resize-detector/-/resize-detector-0.3.0.tgz#fe495112e184695500a8f51e0389f15774cb1cfc"
-  integrity sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11775,11 +11761,6 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -12232,19 +12213,6 @@ vue-color@^2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
-vue-demi@^0.13.2:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
-  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
-
-vue-echarts@^6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/vue-echarts/-/vue-echarts-6.2.3.tgz#77973c417a56bca76847576ab903ab92979d75bb"
-  integrity sha512-xHzUvgsgk/asJTcNa8iVVwoovZU3iEUHvmBa3bzbiP3Y6OMxM1YXsoWOKVmVVaUusGs4ob4pSwjwNy2FemAz9w==
-  dependencies:
-    resize-detector "^0.3.0"
-    vue-demi "^0.13.2"
-
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
@@ -12866,10 +12834,3 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
-
-zrender@5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.3.2.tgz#f67b11d36d3d020d62411d3bb123eb1c93cccd69"
-  integrity sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==
-  dependencies:
-    tslib "2.3.0"
diff --git a/client/web/reporter/package.json b/client/web/reporter/package.json
index 0edda4313..d1ebcfb82 100644
--- a/client/web/reporter/package.json
+++ b/client/web/reporter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corteza-reporter",
-  "version": "2023.9.6-b",
+  "version": "2023.9.7-rc.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -15,8 +15,8 @@
     "pre-commit": "yarn lint"
   },
   "dependencies": {
-    "@cortezaproject/corteza-js": "^2023.9.6-b",
-    "@cortezaproject/corteza-vue": "^2023.9.6-b",
+    "@cortezaproject/corteza-js": "^2023.9.7-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.7-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 995c1b21d..9cf2f3b32 100644
--- a/client/web/reporter/yarn.lock
+++ b/client/web/reporter/yarn.lock
@@ -1057,10 +1057,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.6-b.tgz#44de2d07cb51cb4c54d5500e582839e5c08a7c28"
-  integrity sha512-xNeVxw2lnNtAa7ZxOWKlhh//fwS/ZafYa4Uc5T6MijgqBLFU4lLlIAFqEa62cfSbc+b5yY2Hh0QOQGVVEaSgdQ==
+"@cortezaproject/corteza-js@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.7-rc.1.tgz#b6bd5ba37f1cd9a0e7ad64e74c694e7aa3293347"
+  integrity sha512-41kqlyHjfVXZSh19sySJXWZA+lG84ENEhK8Nnpf+7cd0IS7lyMtmf7Q/W/FGfJXc1Mr9bqbbRvroONaCGwBjBQ==
   dependencies:
     axios "^0.28.0"
     hex-rgb "^4.1.0"
@@ -1071,12 +1071,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.6-b.tgz#e9e3642d0218bb848475a3a9bfab01b0626554af"
-  integrity sha512-npMCkURGF1uDyZjaHkY7q3rI28iYlAYGjaVOQPONxyVc5+l0eP3MVIDxmdDq8y2y9k1Cdnwg1PRAJuYElNApLg==
+"@cortezaproject/corteza-vue@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.7-rc.1.tgz#8c4c08e7912ad4da8f09952de8a7471644147ee0"
+  integrity sha512-BopFmWsSyHbsodX97E8ktmjCtdR4+GlR0J2HDLsItqyyyFEOnfoyDn6ShMrxa3OiPlf/13YFr4iKuzMHq0YezA==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.6-b"
+    "@cortezaproject/corteza-js" "^2023.9.7-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -1084,7 +1084,6 @@
     "@popperjs/core" "^2.11.2"
     acorn "^7.3.1"
     bootstrap-vue "2.23.1"
-    echarts "^5.3.3"
     fuzzysort "^1.2.1"
     highlight.js "^10.4.1"
     html-parse-stringify "^3.0.1"
@@ -1105,8 +1104,8 @@
     tiptap "^1.26.0"
     tiptap-extensions "^1.28.4"
     v-photoswipe "^1.0.3-1"
+    vue "2.6.14"
     vue-color "^2.8.1"
-    vue-echarts "^6.2.3"
     vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
@@ -4583,14 +4582,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.3.tgz#df97b09c4c0e2ffcdfb44acf518d50c50e0b838e"
-  integrity sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==
-  dependencies:
-    tslib "2.3.0"
-    zrender "5.3.2"
-
 editorconfig@^0.15.3:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
@@ -10305,11 +10296,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-resize-detector@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/resize-detector/-/resize-detector-0.3.0.tgz#fe495112e184695500a8f51e0389f15774cb1cfc"
-  integrity sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11799,11 +11785,6 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -12256,19 +12237,6 @@ vue-color@^2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
-vue-demi@^0.13.2:
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.6.tgz#f9433cbd75e68a970dec066647f4ba6c08ced48f"
-  integrity sha512-02NYpxgyGE2kKGegRPYlNQSL1UWfA/+JqvzhGCOYjhfbLWXU5QQX0+9pAm/R2sCOPKr5NBxVIab7fvFU0B1RxQ==
-
-vue-echarts@^6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/vue-echarts/-/vue-echarts-6.2.3.tgz#77973c417a56bca76847576ab903ab92979d75bb"
-  integrity sha512-xHzUvgsgk/asJTcNa8iVVwoovZU3iEUHvmBa3bzbiP3Y6OMxM1YXsoWOKVmVVaUusGs4ob4pSwjwNy2FemAz9w==
-  dependencies:
-    resize-detector "^0.3.0"
-    vue-demi "^0.13.2"
-
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
@@ -12902,10 +12870,3 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
-
-zrender@5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.3.2.tgz#f67b11d36d3d020d62411d3bb123eb1c93cccd69"
-  integrity sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==
-  dependencies:
-    tslib "2.3.0"
diff --git a/client/web/workflow/package.json b/client/web/workflow/package.json
index ce6ff0504..aecdae6c7 100644
--- a/client/web/workflow/package.json
+++ b/client/web/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "corteza-workflow",
-  "version": "2023.9.6-b",
+  "version": "2023.9.7-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.6-b",
-    "@cortezaproject/corteza-vue": "^2023.9.6-b",
+    "@cortezaproject/corteza-js": "^2023.9.7-rc.1",
+    "@cortezaproject/corteza-vue": "^2023.9.7-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 d2178f6fb..e0ea5f55a 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.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.6-b.tgz#44de2d07cb51cb4c54d5500e582839e5c08a7c28"
-  integrity sha512-xNeVxw2lnNtAa7ZxOWKlhh//fwS/ZafYa4Uc5T6MijgqBLFU4lLlIAFqEa62cfSbc+b5yY2Hh0QOQGVVEaSgdQ==
+"@cortezaproject/corteza-js@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.7-rc.1.tgz#b6bd5ba37f1cd9a0e7ad64e74c694e7aa3293347"
+  integrity sha512-41kqlyHjfVXZSh19sySJXWZA+lG84ENEhK8Nnpf+7cd0IS7lyMtmf7Q/W/FGfJXc1Mr9bqbbRvroONaCGwBjBQ==
   dependencies:
     axios "^0.28.0"
     hex-rgb "^4.1.0"
@@ -1078,12 +1078,12 @@
     numeral "^2.0.6"
     pino "^5.16.0"
 
-"@cortezaproject/corteza-vue@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.6-b.tgz#e9e3642d0218bb848475a3a9bfab01b0626554af"
-  integrity sha512-npMCkURGF1uDyZjaHkY7q3rI28iYlAYGjaVOQPONxyVc5+l0eP3MVIDxmdDq8y2y9k1Cdnwg1PRAJuYElNApLg==
+"@cortezaproject/corteza-vue@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-vue/-/corteza-vue-2023.9.7-rc.1.tgz#8c4c08e7912ad4da8f09952de8a7471644147ee0"
+  integrity sha512-BopFmWsSyHbsodX97E8ktmjCtdR4+GlR0J2HDLsItqyyyFEOnfoyDn6ShMrxa3OiPlf/13YFr4iKuzMHq0YezA==
   dependencies:
-    "@cortezaproject/corteza-js" "^2023.9.6-b"
+    "@cortezaproject/corteza-js" "^2023.9.7-rc.1"
     "@fortawesome/fontawesome-svg-core" "^1.2.26"
     "@fortawesome/free-solid-svg-icons" "^5.12.0"
     "@fortawesome/vue-fontawesome" "^0.1.9"
@@ -1091,7 +1091,6 @@
     "@popperjs/core" "^2.11.2"
     acorn "^7.3.1"
     bootstrap-vue "2.23.1"
-    echarts "^5.3.3"
     fuzzysort "^1.2.1"
     highlight.js "^10.4.1"
     html-parse-stringify "^3.0.1"
@@ -1112,8 +1111,8 @@
     tiptap "^1.26.0"
     tiptap-extensions "^1.28.4"
     v-photoswipe "^1.0.3-1"
+    vue "2.6.14"
     vue-color "^2.8.1"
-    vue-echarts "^6.2.3"
     vue-select "3.20.2"
     vue-swatches "^1.0.4"
     vue2-ace-editor "^0.0.15"
@@ -4484,14 +4483,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.3.tgz#df97b09c4c0e2ffcdfb44acf518d50c50e0b838e"
-  integrity sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==
-  dependencies:
-    tslib "2.3.0"
-    zrender "5.3.2"
-
 editorconfig@^0.15.3:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
@@ -10343,11 +10334,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-resize-detector@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/resize-detector/-/resize-detector-0.3.0.tgz#fe495112e184695500a8f51e0389f15774cb1cfc"
-  integrity sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -11846,11 +11832,6 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
 tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -12302,19 +12283,6 @@ vue-color@^2.8.1:
     material-colors "^1.0.0"
     tinycolor2 "^1.1.2"
 
-vue-demi@^0.13.2:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
-  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
-
-vue-echarts@^6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/vue-echarts/-/vue-echarts-6.2.3.tgz#77973c417a56bca76847576ab903ab92979d75bb"
-  integrity sha512-xHzUvgsgk/asJTcNa8iVVwoovZU3iEUHvmBa3bzbiP3Y6OMxM1YXsoWOKVmVVaUusGs4ob4pSwjwNy2FemAz9w==
-  dependencies:
-    resize-detector "^0.3.0"
-    vue-demi "^0.13.2"
-
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1"
@@ -12937,10 +12905,3 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
-
-zrender@5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.3.2.tgz#f67b11d36d3d020d62411d3bb123eb1c93cccd69"
-  integrity sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==
-  dependencies:
-    tslib "2.3.0"
diff --git a/lib/js/package.json b/lib/js/package.json
index 39615883e..1962b51e1 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.6-b",
+  "version": "2023.9.7-rc.1",
   "license": "Apache-2.0",
   "author": "Denis Arh <denis.arh@crust.tech>",
   "main": "dist/index.js",
diff --git a/lib/js/src/compose/types/page-block/record-list.ts b/lib/js/src/compose/types/page-block/record-list.ts
index 2323c32e9..57e8ce7fa 100644
--- a/lib/js/src/compose/types/page-block/record-list.ts
+++ b/lib/js/src/compose/types/page-block/record-list.ts
@@ -50,21 +50,19 @@ interface Options {
   positionField?: string;
   refField?: string; // When adding a new record, prefill refField value with parent record ID
   editFields?: unknown[];
-  
-  // When adding a new record, link it to parent when available
-  linkToParent: boolean;
-  
+  linkToParent: boolean; // Legacy
+
   // Should records be opened in a new tab
   // legacy field that has been removed but we keep it for backwards compatibility
   openInNewTab: boolean;
-  
+
   // Are table rows selectable
   selectable: boolean;
   selectMode: 'multi' | 'single' | 'range';
-  
+
   // Ordered list of buttons to display in the block
   selectionButtons: Array<Button>;
-  
+
   bulkRecordEditEnabled: boolean;
   inlineRecordEditEnabled: boolean;
   filterPresets: FilterPreset[];
diff --git a/lib/vue/package.json b/lib/vue/package.json
index bec127ff4..f12d2c60a 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.6-b",
+  "version": "2023.9.7-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.6-b",
+    "@cortezaproject/corteza-js": "^2023.9.7-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 d0d7bcc1d..b82b57575 100644
--- a/lib/vue/yarn.lock
+++ b/lib/vue/yarn.lock
@@ -1031,10 +1031,10 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@cortezaproject/corteza-js@^2023.9.6-b":
-  version "2023.9.6-b"
-  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.6-b.tgz#44de2d07cb51cb4c54d5500e582839e5c08a7c28"
-  integrity sha512-xNeVxw2lnNtAa7ZxOWKlhh//fwS/ZafYa4Uc5T6MijgqBLFU4lLlIAFqEa62cfSbc+b5yY2Hh0QOQGVVEaSgdQ==
+"@cortezaproject/corteza-js@^2023.9.7-rc.1":
+  version "2023.9.7-rc.1"
+  resolved "https://registry.yarnpkg.com/@cortezaproject/corteza-js/-/corteza-js-2023.9.7-rc.1.tgz#b6bd5ba37f1cd9a0e7ad64e74c694e7aa3293347"
+  integrity sha512-41kqlyHjfVXZSh19sySJXWZA+lG84ENEhK8Nnpf+7cd0IS7lyMtmf7Q/W/FGfJXc1Mr9bqbbRvroONaCGwBjBQ==
   dependencies:
     axios "^0.28.0"
     hex-rgb "^4.1.0"