diff --git a/package-lock.json b/package-lock.json
index 89f105052..8e0b1c6b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18538,33 +18538,62 @@
         "vuex": "^3.x"
       }
     },
-    "packages/clients/afm/node_modules/@polar/core": {
-      "version": "2.0.0-alpha.2",
-      "resolved": "https://registry.npmjs.org/@polar/core/-/core-2.0.0-alpha.2.tgz",
-      "integrity": "sha512-tBwlCCbUwDvqmsF0DsDgB6aBPOP9kaxPlW4CmXupTDI5vrKg/Tj1tIwp9ClS0lS34Mm/PoMZYQVoVDDfwMheNw==",
+    "packages/clients/afm/node_modules/@polar/lib-get-features": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@polar/lib-get-features/-/lib-get-features-1.0.1.tgz",
+      "integrity": "sha512-qFcA5zoro0n70V+yc5BGua7Elu3kdlRuVJeG4Z5TWDZVyok+xUlUzpsXmuuk2VLB0W+6J7hJ0rIKMyBW/hqdVg==",
+      "dev": true,
+      "peerDependencies": {
+        "ol": "^7.1.0"
+      }
+    },
+    "packages/clients/afm/node_modules/@polar/plugin-address-search": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-address-search/-/plugin-address-search-1.2.1.tgz",
+      "integrity": "sha512-BiIiblpplyXTllEclwvykNQyOzHbiIPMQQch+/sLt3ZFo0jErs9zoNSWCyXToAAuYdbbxnlBRHWaW2b1HwE0yQ==",
       "dev": true,
       "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.2.1",
+        "@polar/lib-get-features": "^1.0.0",
+        "lodash.debounce": "^4.0.8"
+      },
+      "peerDependencies": {
         "@masterportal/masterportalapi": "2.8.0",
-        "@polar/components": "^2.0.0",
-        "@polar/lib-get-cluster": "1.1.0-alpha.1",
-        "@polar/lib-idx": "1.1.0-alpha.1",
-        "@polar/lib-invisible-style": "1.1.0-alpha.1",
-        "@repositoryname/noop": "^1.0.6",
         "@repositoryname/vuex-generators": "^1.1.2",
-        "hammerjs": "2.0.8",
-        "i18next": "^23.7.16",
-        "i18next-browser-languagedetector": "^7.2.0",
-        "i18next-vue": "^1.1.0",
-        "lodash.kebabcase": "^4.1.1",
-        "lodash.merge": "^4.6.2",
-        "olcs": "2.13.1",
+        "ol": "7.1.0",
         "vue": "^2.6.14",
-        "vuetify": "^2.5.9",
         "vuex": "^3.6.2"
+      }
+    },
+    "packages/clients/afm/node_modules/@polar/plugin-gfi": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-gfi/-/plugin-gfi-1.2.2.tgz",
+      "integrity": "sha512-Hc7OC1ssZ9O7rEJw2Je5XJmgVivj1YJDrpsBwnZpJjWQwowqdt1TTJVNsZOnNLFuw2tA+dT5wOXUwkGypNixOw==",
+      "dev": true,
+      "dependencies": {
+        "just-compare": "^2.3.0",
+        "lodash.debounce": "^4.0.8"
       },
       "peerDependencies": {
-        "ol": "^7.1.0"
+        "@masterportal/masterportalapi": "2.8.0",
+        "@repositoryname/vuex-generators": "^1.1.2",
+        "ol": "^7.1.0",
+        "vue": "^2.6.14",
+        "vuex": "^3.6.2"
+      }
+    },
+    "packages/clients/afm/node_modules/@polar/plugin-pins": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-pins/-/plugin-pins-1.3.0.tgz",
+      "integrity": "sha512-edIvCqoNUo0nJjtMg9q2qHY2y6Cd14iWNIoQ0+zhCQ1YeDuIxDIyQIjlSgU+KbFW4iprO2WtnyXMvXV828VGLA==",
+      "dev": true,
+      "dependencies": {
+        "@polar/lib-idx": "*"
+      },
+      "peerDependencies": {
+        "@repositoryname/vuex-generators": "^1.1.2",
+        "ol": "^7.1.0",
+        "vue": "^2.6.14",
+        "vuex": "^3.6.2"
       }
     },
     "packages/clients/dish": {
@@ -18593,35 +18622,64 @@
         "lodash.merge": "^4.6.2"
       }
     },
-    "packages/clients/dish/node_modules/@polar/core": {
-      "version": "2.0.0-alpha.2",
-      "resolved": "https://registry.npmjs.org/@polar/core/-/core-2.0.0-alpha.2.tgz",
-      "integrity": "sha512-tBwlCCbUwDvqmsF0DsDgB6aBPOP9kaxPlW4CmXupTDI5vrKg/Tj1tIwp9ClS0lS34Mm/PoMZYQVoVDDfwMheNw==",
+    "packages/clients/dish/node_modules/@polar/plugin-address-search": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-address-search/-/plugin-address-search-1.2.1.tgz",
+      "integrity": "sha512-BiIiblpplyXTllEclwvykNQyOzHbiIPMQQch+/sLt3ZFo0jErs9zoNSWCyXToAAuYdbbxnlBRHWaW2b1HwE0yQ==",
       "dev": true,
       "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.2.1",
+        "@polar/lib-get-features": "^1.0.0",
+        "lodash.debounce": "^4.0.8"
+      },
+      "peerDependencies": {
         "@masterportal/masterportalapi": "2.8.0",
-        "@polar/components": "^2.0.0",
-        "@polar/lib-get-cluster": "1.1.0-alpha.1",
-        "@polar/lib-idx": "1.1.0-alpha.1",
-        "@polar/lib-invisible-style": "1.1.0-alpha.1",
-        "@repositoryname/noop": "^1.0.6",
         "@repositoryname/vuex-generators": "^1.1.2",
-        "hammerjs": "2.0.8",
-        "i18next": "^23.7.16",
-        "i18next-browser-languagedetector": "^7.2.0",
-        "i18next-vue": "^1.1.0",
-        "lodash.kebabcase": "^4.1.1",
-        "lodash.merge": "^4.6.2",
-        "olcs": "2.13.1",
+        "ol": "7.1.0",
         "vue": "^2.6.14",
-        "vuetify": "^2.5.9",
         "vuex": "^3.6.2"
-      },
+      }
+    },
+    "packages/clients/dish/node_modules/@polar/plugin-address-search/node_modules/@polar/lib-get-features": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@polar/lib-get-features/-/lib-get-features-1.0.1.tgz",
+      "integrity": "sha512-qFcA5zoro0n70V+yc5BGua7Elu3kdlRuVJeG4Z5TWDZVyok+xUlUzpsXmuuk2VLB0W+6J7hJ0rIKMyBW/hqdVg==",
+      "dev": true,
       "peerDependencies": {
         "ol": "^7.1.0"
       }
     },
+    "packages/clients/dish/node_modules/@polar/plugin-gfi": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-gfi/-/plugin-gfi-1.2.2.tgz",
+      "integrity": "sha512-Hc7OC1ssZ9O7rEJw2Je5XJmgVivj1YJDrpsBwnZpJjWQwowqdt1TTJVNsZOnNLFuw2tA+dT5wOXUwkGypNixOw==",
+      "dev": true,
+      "dependencies": {
+        "just-compare": "^2.3.0",
+        "lodash.debounce": "^4.0.8"
+      },
+      "peerDependencies": {
+        "@masterportal/masterportalapi": "2.8.0",
+        "@repositoryname/vuex-generators": "^1.1.2",
+        "ol": "^7.1.0",
+        "vue": "^2.6.14",
+        "vuex": "^3.6.2"
+      }
+    },
+    "packages/clients/dish/node_modules/@polar/plugin-pins": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-pins/-/plugin-pins-1.3.0.tgz",
+      "integrity": "sha512-edIvCqoNUo0nJjtMg9q2qHY2y6Cd14iWNIoQ0+zhCQ1YeDuIxDIyQIjlSgU+KbFW4iprO2WtnyXMvXV828VGLA==",
+      "dev": true,
+      "dependencies": {
+        "@polar/lib-idx": "*"
+      },
+      "peerDependencies": {
+        "@repositoryname/vuex-generators": "^1.1.2",
+        "ol": "^7.1.0",
+        "vue": "^2.6.14",
+        "vuex": "^3.6.2"
+      }
+    },
     "packages/clients/generic": {
       "name": "@polar/client-generic",
       "version": "0.1.0",
@@ -18648,33 +18706,62 @@
         "@polar/plugin-zoom": "^1.2.0"
       }
     },
-    "packages/clients/generic/node_modules/@polar/core": {
-      "version": "2.0.0-alpha.2",
-      "resolved": "https://registry.npmjs.org/@polar/core/-/core-2.0.0-alpha.2.tgz",
-      "integrity": "sha512-tBwlCCbUwDvqmsF0DsDgB6aBPOP9kaxPlW4CmXupTDI5vrKg/Tj1tIwp9ClS0lS34Mm/PoMZYQVoVDDfwMheNw==",
+    "packages/clients/generic/node_modules/@polar/lib-get-features": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@polar/lib-get-features/-/lib-get-features-1.0.1.tgz",
+      "integrity": "sha512-qFcA5zoro0n70V+yc5BGua7Elu3kdlRuVJeG4Z5TWDZVyok+xUlUzpsXmuuk2VLB0W+6J7hJ0rIKMyBW/hqdVg==",
+      "dev": true,
+      "peerDependencies": {
+        "ol": "^7.1.0"
+      }
+    },
+    "packages/clients/generic/node_modules/@polar/plugin-address-search": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-address-search/-/plugin-address-search-1.2.1.tgz",
+      "integrity": "sha512-BiIiblpplyXTllEclwvykNQyOzHbiIPMQQch+/sLt3ZFo0jErs9zoNSWCyXToAAuYdbbxnlBRHWaW2b1HwE0yQ==",
       "dev": true,
       "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.2.1",
+        "@polar/lib-get-features": "^1.0.0",
+        "lodash.debounce": "^4.0.8"
+      },
+      "peerDependencies": {
         "@masterportal/masterportalapi": "2.8.0",
-        "@polar/components": "^2.0.0",
-        "@polar/lib-get-cluster": "1.1.0-alpha.1",
-        "@polar/lib-idx": "1.1.0-alpha.1",
-        "@polar/lib-invisible-style": "1.1.0-alpha.1",
-        "@repositoryname/noop": "^1.0.6",
         "@repositoryname/vuex-generators": "^1.1.2",
-        "hammerjs": "2.0.8",
-        "i18next": "^23.7.16",
-        "i18next-browser-languagedetector": "^7.2.0",
-        "i18next-vue": "^1.1.0",
-        "lodash.kebabcase": "^4.1.1",
-        "lodash.merge": "^4.6.2",
-        "olcs": "2.13.1",
+        "ol": "7.1.0",
+        "vue": "^2.6.14",
+        "vuex": "^3.6.2"
+      }
+    },
+    "packages/clients/generic/node_modules/@polar/plugin-gfi": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-gfi/-/plugin-gfi-1.2.2.tgz",
+      "integrity": "sha512-Hc7OC1ssZ9O7rEJw2Je5XJmgVivj1YJDrpsBwnZpJjWQwowqdt1TTJVNsZOnNLFuw2tA+dT5wOXUwkGypNixOw==",
+      "dev": true,
+      "dependencies": {
+        "just-compare": "^2.3.0",
+        "lodash.debounce": "^4.0.8"
+      },
+      "peerDependencies": {
+        "@masterportal/masterportalapi": "2.8.0",
+        "@repositoryname/vuex-generators": "^1.1.2",
+        "ol": "^7.1.0",
         "vue": "^2.6.14",
-        "vuetify": "^2.5.9",
         "vuex": "^3.6.2"
+      }
+    },
+    "packages/clients/generic/node_modules/@polar/plugin-pins": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-pins/-/plugin-pins-1.3.0.tgz",
+      "integrity": "sha512-edIvCqoNUo0nJjtMg9q2qHY2y6Cd14iWNIoQ0+zhCQ1YeDuIxDIyQIjlSgU+KbFW4iprO2WtnyXMvXV828VGLA==",
+      "dev": true,
+      "dependencies": {
+        "@polar/lib-idx": "*"
       },
       "peerDependencies": {
-        "ol": "^7.1.0"
+        "@repositoryname/vuex-generators": "^1.1.2",
+        "ol": "^7.1.0",
+        "vue": "^2.6.14",
+        "vuex": "^3.6.2"
       }
     },
     "packages/clients/meldemichel": {
@@ -18701,33 +18788,62 @@
         "@polar/plugin-zoom": "^1.1.0"
       }
     },
-    "packages/clients/meldemichel/node_modules/@polar/core": {
-      "version": "2.0.0-alpha.2",
-      "resolved": "https://registry.npmjs.org/@polar/core/-/core-2.0.0-alpha.2.tgz",
-      "integrity": "sha512-tBwlCCbUwDvqmsF0DsDgB6aBPOP9kaxPlW4CmXupTDI5vrKg/Tj1tIwp9ClS0lS34Mm/PoMZYQVoVDDfwMheNw==",
+    "packages/clients/meldemichel/node_modules/@polar/lib-get-features": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@polar/lib-get-features/-/lib-get-features-1.0.1.tgz",
+      "integrity": "sha512-qFcA5zoro0n70V+yc5BGua7Elu3kdlRuVJeG4Z5TWDZVyok+xUlUzpsXmuuk2VLB0W+6J7hJ0rIKMyBW/hqdVg==",
+      "dev": true,
+      "peerDependencies": {
+        "ol": "^7.1.0"
+      }
+    },
+    "packages/clients/meldemichel/node_modules/@polar/plugin-address-search": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-address-search/-/plugin-address-search-1.2.1.tgz",
+      "integrity": "sha512-BiIiblpplyXTllEclwvykNQyOzHbiIPMQQch+/sLt3ZFo0jErs9zoNSWCyXToAAuYdbbxnlBRHWaW2b1HwE0yQ==",
       "dev": true,
       "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.2.1",
+        "@polar/lib-get-features": "^1.0.0",
+        "lodash.debounce": "^4.0.8"
+      },
+      "peerDependencies": {
         "@masterportal/masterportalapi": "2.8.0",
-        "@polar/components": "^2.0.0",
-        "@polar/lib-get-cluster": "1.1.0-alpha.1",
-        "@polar/lib-idx": "1.1.0-alpha.1",
-        "@polar/lib-invisible-style": "1.1.0-alpha.1",
-        "@repositoryname/noop": "^1.0.6",
         "@repositoryname/vuex-generators": "^1.1.2",
-        "hammerjs": "2.0.8",
-        "i18next": "^23.7.16",
-        "i18next-browser-languagedetector": "^7.2.0",
-        "i18next-vue": "^1.1.0",
-        "lodash.kebabcase": "^4.1.1",
-        "lodash.merge": "^4.6.2",
-        "olcs": "2.13.1",
+        "ol": "7.1.0",
         "vue": "^2.6.14",
-        "vuetify": "^2.5.9",
         "vuex": "^3.6.2"
+      }
+    },
+    "packages/clients/meldemichel/node_modules/@polar/plugin-gfi": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-gfi/-/plugin-gfi-1.2.2.tgz",
+      "integrity": "sha512-Hc7OC1ssZ9O7rEJw2Je5XJmgVivj1YJDrpsBwnZpJjWQwowqdt1TTJVNsZOnNLFuw2tA+dT5wOXUwkGypNixOw==",
+      "dev": true,
+      "dependencies": {
+        "just-compare": "^2.3.0",
+        "lodash.debounce": "^4.0.8"
       },
       "peerDependencies": {
-        "ol": "^7.1.0"
+        "@masterportal/masterportalapi": "2.8.0",
+        "@repositoryname/vuex-generators": "^1.1.2",
+        "ol": "^7.1.0",
+        "vue": "^2.6.14",
+        "vuex": "^3.6.2"
+      }
+    },
+    "packages/clients/meldemichel/node_modules/@polar/plugin-pins": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@polar/plugin-pins/-/plugin-pins-1.3.0.tgz",
+      "integrity": "sha512-edIvCqoNUo0nJjtMg9q2qHY2y6Cd14iWNIoQ0+zhCQ1YeDuIxDIyQIjlSgU+KbFW4iprO2WtnyXMvXV828VGLA==",
+      "dev": true,
+      "dependencies": {
+        "@polar/lib-idx": "*"
+      },
+      "peerDependencies": {
+        "@repositoryname/vuex-generators": "^1.1.2",
+        "ol": "^7.1.0",
+        "vue": "^2.6.14",
+        "vuex": "^3.6.2"
       }
     },
     "packages/clients/snowbox": {
@@ -18767,7 +18883,7 @@
     },
     "packages/core": {
       "name": "@polar/core",
-      "version": "2.0.0-alpha.1",
+      "version": "2.0.0-alpha.2",
       "license": "EUPL-1.2",
       "dependencies": {
         "@fortawesome/fontawesome-free": "^6.2.1",
@@ -18784,6 +18900,7 @@
         "i18next-vue": "^1.1.0",
         "lodash.kebabcase": "^4.1.1",
         "lodash.merge": "^4.6.2",
+        "olcs": "2.13.1",
         "vue": "^2.6.14",
         "vuetify": "^2.5.9",
         "vuex": "^3.6.2"
@@ -18792,8 +18909,7 @@
         "@polar/lib-custom-types": "^1.4.0"
       },
       "peerDependencies": {
-        "ol": "^7.1.0",
-        "olcs": "2.13.1"
+        "ol": "^7.1.0"
       }
     },
     "packages/lib/getCluster": {
@@ -18854,7 +18970,7 @@
     },
     "packages/plugins/AddressSearch": {
       "name": "@polar/plugin-address-search",
-      "version": "1.2.1",
+      "version": "2.0.0-alpha.1",
       "license": "EUPL-1.2",
       "dependencies": {
         "@polar/lib-get-features": "2.0.0-alpha.1",
@@ -18992,7 +19108,7 @@
     },
     "packages/plugins/Gfi": {
       "name": "@polar/plugin-gfi",
-      "version": "1.2.2",
+      "version": "2.0.0-alpha.1",
       "license": "EUPL-1.2",
       "dependencies": {
         "@polar/lib-get-cluster": "1.1.0-alpha.1",
@@ -19072,7 +19188,7 @@
     },
     "packages/plugins/Pins": {
       "name": "@polar/plugin-pins",
-      "version": "1.3.0",
+      "version": "2.0.0-alpha.1",
       "license": "EUPL-1.2",
       "dependencies": {
         "@polar/lib-passes-boundary-check": "2.1.0-alpha.1"
@@ -22345,30 +22461,39 @@
         "@polar/plugin-zoom": "^1.0.0"
       },
       "dependencies": {
-        "@polar/core": {
-          "version": "2.0.0-alpha.2",
-          "resolved": "https://registry.npmjs.org/@polar/core/-/core-2.0.0-alpha.2.tgz",
-          "integrity": "sha512-tBwlCCbUwDvqmsF0DsDgB6aBPOP9kaxPlW4CmXupTDI5vrKg/Tj1tIwp9ClS0lS34Mm/PoMZYQVoVDDfwMheNw==",
-          "dev": true,
-          "requires": {
-            "@fortawesome/fontawesome-free": "^6.2.1",
-            "@masterportal/masterportalapi": "2.8.0",
-            "@polar/components": "^2.0.0",
-            "@polar/lib-get-cluster": "1.1.0-alpha.1",
-            "@polar/lib-idx": "1.1.0-alpha.1",
-            "@polar/lib-invisible-style": "1.1.0-alpha.1",
-            "@repositoryname/noop": "^1.0.6",
-            "@repositoryname/vuex-generators": "^1.1.2",
-            "hammerjs": "2.0.8",
-            "i18next": "^23.7.16",
-            "i18next-browser-languagedetector": "^7.2.0",
-            "i18next-vue": "^1.1.0",
-            "lodash.kebabcase": "^4.1.1",
-            "lodash.merge": "^4.6.2",
-            "olcs": "2.13.1",
-            "vue": "^2.6.14",
-            "vuetify": "^2.5.9",
-            "vuex": "^3.6.2"
+        "@polar/lib-get-features": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@polar/lib-get-features/-/lib-get-features-1.0.1.tgz",
+          "integrity": "sha512-qFcA5zoro0n70V+yc5BGua7Elu3kdlRuVJeG4Z5TWDZVyok+xUlUzpsXmuuk2VLB0W+6J7hJ0rIKMyBW/hqdVg==",
+          "dev": true
+        },
+        "@polar/plugin-address-search": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-address-search/-/plugin-address-search-1.2.1.tgz",
+          "integrity": "sha512-BiIiblpplyXTllEclwvykNQyOzHbiIPMQQch+/sLt3ZFo0jErs9zoNSWCyXToAAuYdbbxnlBRHWaW2b1HwE0yQ==",
+          "dev": true,
+          "requires": {
+            "@polar/lib-get-features": "^1.0.0",
+            "lodash.debounce": "^4.0.8"
+          }
+        },
+        "@polar/plugin-gfi": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-gfi/-/plugin-gfi-1.2.2.tgz",
+          "integrity": "sha512-Hc7OC1ssZ9O7rEJw2Je5XJmgVivj1YJDrpsBwnZpJjWQwowqdt1TTJVNsZOnNLFuw2tA+dT5wOXUwkGypNixOw==",
+          "dev": true,
+          "requires": {
+            "just-compare": "^2.3.0",
+            "lodash.debounce": "^4.0.8"
+          }
+        },
+        "@polar/plugin-pins": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-pins/-/plugin-pins-1.3.0.tgz",
+          "integrity": "sha512-edIvCqoNUo0nJjtMg9q2qHY2y6Cd14iWNIoQ0+zhCQ1YeDuIxDIyQIjlSgU+KbFW4iprO2WtnyXMvXV828VGLA==",
+          "dev": true,
+          "requires": {
+            "@polar/lib-idx": "*"
           }
         }
       }
@@ -22397,30 +22522,41 @@
         "lodash.merge": "^4.6.2"
       },
       "dependencies": {
-        "@polar/core": {
-          "version": "2.0.0-alpha.2",
-          "resolved": "https://registry.npmjs.org/@polar/core/-/core-2.0.0-alpha.2.tgz",
-          "integrity": "sha512-tBwlCCbUwDvqmsF0DsDgB6aBPOP9kaxPlW4CmXupTDI5vrKg/Tj1tIwp9ClS0lS34Mm/PoMZYQVoVDDfwMheNw==",
-          "dev": true,
-          "requires": {
-            "@fortawesome/fontawesome-free": "^6.2.1",
-            "@masterportal/masterportalapi": "2.8.0",
-            "@polar/components": "^2.0.0",
-            "@polar/lib-get-cluster": "1.1.0-alpha.1",
-            "@polar/lib-idx": "1.1.0-alpha.1",
-            "@polar/lib-invisible-style": "1.1.0-alpha.1",
-            "@repositoryname/noop": "^1.0.6",
-            "@repositoryname/vuex-generators": "^1.1.2",
-            "hammerjs": "2.0.8",
-            "i18next": "^23.7.16",
-            "i18next-browser-languagedetector": "^7.2.0",
-            "i18next-vue": "^1.1.0",
-            "lodash.kebabcase": "^4.1.1",
-            "lodash.merge": "^4.6.2",
-            "olcs": "2.13.1",
-            "vue": "^2.6.14",
-            "vuetify": "^2.5.9",
-            "vuex": "^3.6.2"
+        "@polar/plugin-address-search": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-address-search/-/plugin-address-search-1.2.1.tgz",
+          "integrity": "sha512-BiIiblpplyXTllEclwvykNQyOzHbiIPMQQch+/sLt3ZFo0jErs9zoNSWCyXToAAuYdbbxnlBRHWaW2b1HwE0yQ==",
+          "dev": true,
+          "requires": {
+            "@polar/lib-get-features": "^1.0.0",
+            "lodash.debounce": "^4.0.8"
+          },
+          "dependencies": {
+            "@polar/lib-get-features": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/@polar/lib-get-features/-/lib-get-features-1.0.1.tgz",
+              "integrity": "sha512-qFcA5zoro0n70V+yc5BGua7Elu3kdlRuVJeG4Z5TWDZVyok+xUlUzpsXmuuk2VLB0W+6J7hJ0rIKMyBW/hqdVg==",
+              "dev": true
+            }
+          }
+        },
+        "@polar/plugin-gfi": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-gfi/-/plugin-gfi-1.2.2.tgz",
+          "integrity": "sha512-Hc7OC1ssZ9O7rEJw2Je5XJmgVivj1YJDrpsBwnZpJjWQwowqdt1TTJVNsZOnNLFuw2tA+dT5wOXUwkGypNixOw==",
+          "dev": true,
+          "requires": {
+            "just-compare": "^2.3.0",
+            "lodash.debounce": "^4.0.8"
+          }
+        },
+        "@polar/plugin-pins": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-pins/-/plugin-pins-1.3.0.tgz",
+          "integrity": "sha512-edIvCqoNUo0nJjtMg9q2qHY2y6Cd14iWNIoQ0+zhCQ1YeDuIxDIyQIjlSgU+KbFW4iprO2WtnyXMvXV828VGLA==",
+          "dev": true,
+          "requires": {
+            "@polar/lib-idx": "*"
           }
         }
       }
@@ -22449,30 +22585,39 @@
         "@polar/plugin-zoom": "^1.2.0"
       },
       "dependencies": {
-        "@polar/core": {
-          "version": "2.0.0-alpha.2",
-          "resolved": "https://registry.npmjs.org/@polar/core/-/core-2.0.0-alpha.2.tgz",
-          "integrity": "sha512-tBwlCCbUwDvqmsF0DsDgB6aBPOP9kaxPlW4CmXupTDI5vrKg/Tj1tIwp9ClS0lS34Mm/PoMZYQVoVDDfwMheNw==",
-          "dev": true,
-          "requires": {
-            "@fortawesome/fontawesome-free": "^6.2.1",
-            "@masterportal/masterportalapi": "2.8.0",
-            "@polar/components": "^2.0.0",
-            "@polar/lib-get-cluster": "1.1.0-alpha.1",
-            "@polar/lib-idx": "1.1.0-alpha.1",
-            "@polar/lib-invisible-style": "1.1.0-alpha.1",
-            "@repositoryname/noop": "^1.0.6",
-            "@repositoryname/vuex-generators": "^1.1.2",
-            "hammerjs": "2.0.8",
-            "i18next": "^23.7.16",
-            "i18next-browser-languagedetector": "^7.2.0",
-            "i18next-vue": "^1.1.0",
-            "lodash.kebabcase": "^4.1.1",
-            "lodash.merge": "^4.6.2",
-            "olcs": "2.13.1",
-            "vue": "^2.6.14",
-            "vuetify": "^2.5.9",
-            "vuex": "^3.6.2"
+        "@polar/lib-get-features": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@polar/lib-get-features/-/lib-get-features-1.0.1.tgz",
+          "integrity": "sha512-qFcA5zoro0n70V+yc5BGua7Elu3kdlRuVJeG4Z5TWDZVyok+xUlUzpsXmuuk2VLB0W+6J7hJ0rIKMyBW/hqdVg==",
+          "dev": true
+        },
+        "@polar/plugin-address-search": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-address-search/-/plugin-address-search-1.2.1.tgz",
+          "integrity": "sha512-BiIiblpplyXTllEclwvykNQyOzHbiIPMQQch+/sLt3ZFo0jErs9zoNSWCyXToAAuYdbbxnlBRHWaW2b1HwE0yQ==",
+          "dev": true,
+          "requires": {
+            "@polar/lib-get-features": "^1.0.0",
+            "lodash.debounce": "^4.0.8"
+          }
+        },
+        "@polar/plugin-gfi": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-gfi/-/plugin-gfi-1.2.2.tgz",
+          "integrity": "sha512-Hc7OC1ssZ9O7rEJw2Je5XJmgVivj1YJDrpsBwnZpJjWQwowqdt1TTJVNsZOnNLFuw2tA+dT5wOXUwkGypNixOw==",
+          "dev": true,
+          "requires": {
+            "just-compare": "^2.3.0",
+            "lodash.debounce": "^4.0.8"
+          }
+        },
+        "@polar/plugin-pins": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-pins/-/plugin-pins-1.3.0.tgz",
+          "integrity": "sha512-edIvCqoNUo0nJjtMg9q2qHY2y6Cd14iWNIoQ0+zhCQ1YeDuIxDIyQIjlSgU+KbFW4iprO2WtnyXMvXV828VGLA==",
+          "dev": true,
+          "requires": {
+            "@polar/lib-idx": "*"
           }
         }
       }
@@ -22499,30 +22644,39 @@
         "@polar/plugin-zoom": "^1.1.0"
       },
       "dependencies": {
-        "@polar/core": {
-          "version": "2.0.0-alpha.2",
-          "resolved": "https://registry.npmjs.org/@polar/core/-/core-2.0.0-alpha.2.tgz",
-          "integrity": "sha512-tBwlCCbUwDvqmsF0DsDgB6aBPOP9kaxPlW4CmXupTDI5vrKg/Tj1tIwp9ClS0lS34Mm/PoMZYQVoVDDfwMheNw==",
-          "dev": true,
-          "requires": {
-            "@fortawesome/fontawesome-free": "^6.2.1",
-            "@masterportal/masterportalapi": "2.8.0",
-            "@polar/components": "^2.0.0",
-            "@polar/lib-get-cluster": "1.1.0-alpha.1",
-            "@polar/lib-idx": "1.1.0-alpha.1",
-            "@polar/lib-invisible-style": "1.1.0-alpha.1",
-            "@repositoryname/noop": "^1.0.6",
-            "@repositoryname/vuex-generators": "^1.1.2",
-            "hammerjs": "2.0.8",
-            "i18next": "^23.7.16",
-            "i18next-browser-languagedetector": "^7.2.0",
-            "i18next-vue": "^1.1.0",
-            "lodash.kebabcase": "^4.1.1",
-            "lodash.merge": "^4.6.2",
-            "olcs": "2.13.1",
-            "vue": "^2.6.14",
-            "vuetify": "^2.5.9",
-            "vuex": "^3.6.2"
+        "@polar/lib-get-features": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@polar/lib-get-features/-/lib-get-features-1.0.1.tgz",
+          "integrity": "sha512-qFcA5zoro0n70V+yc5BGua7Elu3kdlRuVJeG4Z5TWDZVyok+xUlUzpsXmuuk2VLB0W+6J7hJ0rIKMyBW/hqdVg==",
+          "dev": true
+        },
+        "@polar/plugin-address-search": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-address-search/-/plugin-address-search-1.2.1.tgz",
+          "integrity": "sha512-BiIiblpplyXTllEclwvykNQyOzHbiIPMQQch+/sLt3ZFo0jErs9zoNSWCyXToAAuYdbbxnlBRHWaW2b1HwE0yQ==",
+          "dev": true,
+          "requires": {
+            "@polar/lib-get-features": "^1.0.0",
+            "lodash.debounce": "^4.0.8"
+          }
+        },
+        "@polar/plugin-gfi": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-gfi/-/plugin-gfi-1.2.2.tgz",
+          "integrity": "sha512-Hc7OC1ssZ9O7rEJw2Je5XJmgVivj1YJDrpsBwnZpJjWQwowqdt1TTJVNsZOnNLFuw2tA+dT5wOXUwkGypNixOw==",
+          "dev": true,
+          "requires": {
+            "just-compare": "^2.3.0",
+            "lodash.debounce": "^4.0.8"
+          }
+        },
+        "@polar/plugin-pins": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/@polar/plugin-pins/-/plugin-pins-1.3.0.tgz",
+          "integrity": "sha512-edIvCqoNUo0nJjtMg9q2qHY2y6Cd14iWNIoQ0+zhCQ1YeDuIxDIyQIjlSgU+KbFW4iprO2WtnyXMvXV828VGLA==",
+          "dev": true,
+          "requires": {
+            "@polar/lib-idx": "*"
           }
         }
       }
@@ -22571,6 +22725,7 @@
         "i18next-vue": "^1.1.0",
         "lodash.kebabcase": "^4.1.1",
         "lodash.merge": "^4.6.2",
+        "olcs": "2.13.1",
         "vue": "^2.6.14",
         "vuetify": "^2.5.9",
         "vuex": "^3.6.2"
diff --git a/packages/core/package.json b/packages/core/package.json
index c4e140722..700c8d1e6 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polar/core",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.2",
   "description": "MapClient Core",
   "license": "EUPL-1.2",
   "type": "module",
diff --git a/packages/plugins/AddressSearch/package.json b/packages/plugins/AddressSearch/package.json
index d8b9bed95..386f6c870 100644
--- a/packages/plugins/AddressSearch/package.json
+++ b/packages/plugins/AddressSearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polar/plugin-address-search",
-  "version": "1.2.1",
+  "version": "2.0.0-alpha.1",
   "description": "Plugin AddressSearch",
   "license": "EUPL-1.2",
   "type": "module",
@@ -46,6 +46,8 @@
     "@polar/lib-custom-types": "^1.0.0"
   },
   "nx": {
-    "includedScripts": ["bundle"]
+    "includedScripts": [
+      "bundle"
+    ]
   }
 }
diff --git a/packages/plugins/Gfi/package.json b/packages/plugins/Gfi/package.json
index 2d0529002..205a76662 100644
--- a/packages/plugins/Gfi/package.json
+++ b/packages/plugins/Gfi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polar/plugin-gfi",
-  "version": "1.2.2",
+  "version": "2.0.0-alpha.1",
   "description": "Plugin Gfi",
   "license": "EUPL-1.2",
   "type": "module",
@@ -51,6 +51,8 @@
     "@polar/lib-test-mount-parameters": "^1.1.0"
   },
   "nx": {
-    "includedScripts": ["bundle"]
+    "includedScripts": [
+      "bundle"
+    ]
   }
 }
diff --git a/packages/plugins/Pins/package.json b/packages/plugins/Pins/package.json
index 842a15428..630a6cec3 100644
--- a/packages/plugins/Pins/package.json
+++ b/packages/plugins/Pins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polar/plugin-pins",
-  "version": "1.3.0",
+  "version": "2.0.0-alpha.1",
   "description": "Plugin Pins",
   "license": "EUPL-1.2",
   "type": "module",
@@ -40,6 +40,8 @@
     "vue": "^2.6.14"
   },
   "nx": {
-    "includedScripts": ["bundle"]
+    "includedScripts": [
+      "bundle"
+    ]
   }
 }