diff --git a/install/class_source/class_CustomerSegmentGroup_export.json b/install/class_source/class_CustomerSegmentGroup_export.json
index 21077338..4bac4b8e 100644
--- a/install/class_source/class_CustomerSegmentGroup_export.json
+++ b/install/class_source/class_CustomerSegmentGroup_export.json
@@ -5,7 +5,6 @@
     "allowInherit": false,
     "allowVariants": false,
     "showVariants": false,
-    "generateTypeDeclarations": true,
     "layoutDefinitions": {
         "fieldtype": "panel",
         "labelWidth": 100,
@@ -66,7 +65,7 @@
                                 "tooltip": "",
                                 "mandatory": true,
                                 "noteditable": false,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -107,7 +106,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": true,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -128,7 +127,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": true,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -167,7 +166,7 @@
                                 "tooltip": "Show segment group as filter on customer view",
                                 "mandatory": false,
                                 "noteditable": false,
-                                "index": 1,
+                                "index": true,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -196,7 +195,7 @@
                                 "tooltip": "Set sort order for field. Higher numbers for sort order will have higher priority.",
                                 "mandatory": false,
                                 "noteditable": false,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -217,7 +216,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": false,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -237,7 +236,6 @@
         "locked": false
     },
     "icon": "\/bundles\/pimcorecustomermanagementframework\/icons\/segment-group.svg",
-    "previewUrl": null,
     "group": "CustomerManagement",
     "propertyVisibility": {
         "grid": {
diff --git a/install/class_source/class_CustomerSegment_export.json b/install/class_source/class_CustomerSegment_export.json
index 2d651fc3..a6aed530 100644
--- a/install/class_source/class_CustomerSegment_export.json
+++ b/install/class_source/class_CustomerSegment_export.json
@@ -67,7 +67,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": false,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -111,7 +111,7 @@
                                 "tooltip": "Drag and drop segment into groups in the tree",
                                 "mandatory": false,
                                 "noteditable": true,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -133,7 +133,7 @@
                                 "tooltip": "needs to be unique within the group",
                                 "mandatory": false,
                                 "noteditable": true,
-                                "index": 1,
+                                "index": true,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -151,7 +151,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": true,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -169,7 +169,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": false,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -193,7 +193,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": false,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -213,12 +213,10 @@
         "locked": false
     },
     "icon": "\/bundles\/pimcorecustomermanagementframework\/icons\/segment.svg",
-    "previewUrl": "",
     "group": "CustomerManagement",
     "showAppLoggerTab": false,
     "linkGeneratorReference": "",
     "compositeIndices": [],
-    "generateTypeDeclarations": true,
     "showFieldLookup": false,
     "propertyVisibility": {
         "grid": {
diff --git a/install/class_source/class_LinkActivityDefinition_export.json b/install/class_source/class_LinkActivityDefinition_export.json
index d27d3988..aeae5d3c 100644
--- a/install/class_source/class_LinkActivityDefinition_export.json
+++ b/install/class_source/class_LinkActivityDefinition_export.json
@@ -8,7 +8,6 @@
     "allowInherit": true,
     "allowVariants": false,
     "showVariants": false,
-    "generateTypeDeclarations": true,
     "layoutDefinitions": {
         "fieldtype": "panel",
         "labelWidth": 100,
@@ -76,7 +75,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": true,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -138,7 +137,7 @@
                                         "tooltip": "",
                                         "mandatory": true,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -165,7 +164,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -186,7 +185,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -222,7 +221,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -270,7 +269,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -297,7 +296,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -324,7 +323,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -351,7 +350,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -378,7 +377,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -442,7 +441,7 @@
                                         "tooltip": "",
                                         "mandatory": true,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "float: left; margin-right: 60px;",
                                         "permissions": null,
@@ -469,7 +468,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "float:left;",
                                         "permissions": null,
@@ -492,7 +491,7 @@
                         "tooltip": "",
                         "mandatory": false,
                         "noteditable": false,
-                        "index": null,
+                        "index": false,
                         "locked": false,
                         "style": "",
                         "permissions": null,
@@ -511,10 +510,10 @@
         "icon": null
     },
     "icon": "\/bundles\/pimcoreadmin\/img\/flat-color-icons\/sports_mode.svg",
-    "previewUrl": "\/__customermanagementframework\/object-preview\/link-activity-definition-preview",
     "group": "CustomerManagement",
     "showAppLoggerTab": false,
     "linkGeneratorReference": "@CustomerManagementFrameworkBundle\\LinkGenerator\\LinkActivityDefinitionLinkGenerator",
+    "previewGeneratorReference": "@CustomerManagementFrameworkBundle\\PreviewGenerator\\LinkActivityDefinitionPreviewGenerator",
     "compositeIndices": [],
     "showFieldLookup": false,
     "propertyVisibility": {
diff --git a/install/class_source/class_TermSegmentBuilderDefinition_export.json b/install/class_source/class_TermSegmentBuilderDefinition_export.json
index 5073a906..1f751d4b 100644
--- a/install/class_source/class_TermSegmentBuilderDefinition_export.json
+++ b/install/class_source/class_TermSegmentBuilderDefinition_export.json
@@ -5,7 +5,6 @@
     "allowInherit": false,
     "allowVariants": false,
     "showVariants": false,
-    "generateTypeDeclarations": true,
     "layoutDefinitions": {
         "fieldtype": "panel",
         "labelWidth": 100,
@@ -51,7 +50,7 @@
                         "tooltip": "",
                         "mandatory": true,
                         "noteditable": false,
-                        "index": null,
+                        "index": false,
                         "locked": false,
                         "style": "",
                         "permissions": null,
@@ -84,7 +83,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": false,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -111,7 +110,7 @@
                                 "tooltip": "",
                                 "mandatory": false,
                                 "noteditable": false,
-                                "index": null,
+                                "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
@@ -129,7 +128,7 @@
                         "tooltip": "",
                         "mandatory": false,
                         "noteditable": false,
-                        "index": null,
+                        "index": false,
                         "locked": false,
                         "style": "",
                         "permissions": null,
@@ -146,7 +145,6 @@
         "locked": false
     },
     "icon": "\/bundles\/pimcoreadmin\/img\/flat-color-icons\/data_configuration.svg",
-    "previewUrl": null,
     "group": "CustomerManagement",
     "propertyVisibility": {
         "grid": {
diff --git a/install/class_source/optional/class_Customer_export.json b/install/class_source/optional/class_Customer_export.json
index 41d8091e..9e944823 100644
--- a/install/class_source/optional/class_Customer_export.json
+++ b/install/class_source/optional/class_Customer_export.json
@@ -84,7 +84,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -124,7 +124,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -149,7 +149,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -184,7 +184,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -205,7 +205,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -234,7 +234,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -277,7 +277,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -302,7 +302,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -327,7 +327,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -1395,7 +1395,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -1438,7 +1438,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -1463,7 +1463,7 @@
                                                 "tooltip": "",
                                                 "mandatory": false,
                                                 "noteditable": false,
-                                                "index": null,
+                                                "index": false,
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
@@ -1487,7 +1487,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -1540,7 +1540,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -1596,7 +1596,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": true,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -1638,7 +1638,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": true,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -1683,7 +1683,7 @@
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": false,
-                                        "index": null,
+                                        "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
@@ -1710,12 +1710,10 @@
         "icon": null
     },
     "icon": "\/bundles\/pimcorecustomermanagementframework\/icons\/customer.svg",
-    "previewUrl": null,
     "group": "CustomerManagement",
     "showAppLoggerTab": false,
     "linkGeneratorReference": null,
     "compositeIndices": [],
-    "generateTypeDeclarations": true,
     "showFieldLookup": false,
     "propertyVisibility": {
         "grid": {
diff --git a/src/Controller/Preview/ObjectPreviewController.php b/src/Controller/Preview/ObjectPreviewController.php
index c15af155..e0069367 100644
--- a/src/Controller/Preview/ObjectPreviewController.php
+++ b/src/Controller/Preview/ObjectPreviewController.php
@@ -27,11 +27,11 @@
 class ObjectPreviewController extends FrontendController
 {
     /**
-     * @Route("/link-activity-definition-preview")
+     * @Route("/link-activity-definition-preview", name="cmf_link_activity_definition_preview")
      */
     public function linkActivityDefinitionPreviewAction(Request $request): Response
     {
-        $activityDefinition = LinkActivityDefinition::getById($request->get('pimcore_object_preview'));
+        $activityDefinition = LinkActivityDefinition::getById($request->query->getInt('pimcore_object_preview'));
 
         return $this->render(
             '@PimcoreCustomerManagementFramework/preview/object_preview/link_activity_definition_preview.html.twig',
diff --git a/src/PreviewGenerator/LinkActivityDefinitionPreviewGenerator.php b/src/PreviewGenerator/LinkActivityDefinitionPreviewGenerator.php
new file mode 100644
index 00000000..f6fb7650
--- /dev/null
+++ b/src/PreviewGenerator/LinkActivityDefinitionPreviewGenerator.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Commercial License (PCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
+ */
+
+namespace CustomerManagementFrameworkBundle\PreviewGenerator;
+
+use Pimcore\Model\DataObject\ClassDefinition\PreviewGeneratorInterface;
+use Pimcore\Model\DataObject\Concrete;
+use Symfony\Component\Routing\RouterInterface;
+
+class LinkActivityDefinitionPreviewGenerator implements PreviewGeneratorInterface
+{
+    public function __construct(protected RouterInterface $router)
+    {
+    }
+
+    public function generatePreviewUrl(Concrete $object, array $params): string
+    {
+        return $this->router->generate(
+            'cmf_link_activity_definition_preview',
+            ['pimcore_object_preview' => $object->getId()]
+        );
+    }
+
+    public function getPreviewConfig(Concrete $object): array
+    {
+        return [];
+    }
+}
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
index a094b7d4..5f287591 100644
--- a/src/Resources/config/services.yml
+++ b/src/Resources/config/services.yml
@@ -163,6 +163,8 @@ services:
         arguments:
             - '%pimcore_customer_management_framework.url_activity_tracker.linkCmfcPlaceholder%'
 
+    CustomerManagementFrameworkBundle\PreviewGenerator\LinkActivityDefinitionPreviewGenerator: ~
+
     cmf.link-activity-definition.linkgenerator:
         alias: CustomerManagementFrameworkBundle\LinkGenerator\LinkActivityDefinitionLinkGenerator
         deprecated: