diff --git a/src/CoreBundle/Contao/Hooks/LoadDataContainer.php b/src/CoreBundle/Contao/Hooks/LoadDataContainer.php
index a4a8a92f2..8e9d60a60 100644
--- a/src/CoreBundle/Contao/Hooks/LoadDataContainer.php
+++ b/src/CoreBundle/Contao/Hooks/LoadDataContainer.php
@@ -27,6 +27,7 @@
 use Contao\System;
 use ContaoCommunityAlliance\DcGeneral\Contao\RequestScopeDeterminator;
 use ContaoCommunityAlliance\DcGeneral\Data\ModelId;
+use ContaoCommunityAlliance\DcGeneral\DC\General;
 use Doctrine\DBAL\Connection;
 use MetaModels\CoreBundle\Assets\IconBuilder;
 use MetaModels\Helper\LocaleUtil;
@@ -204,7 +205,7 @@ private function handleNonMetaModelTable(string $tableName): void
             }
 
             // Compatibility with DC_Table.
-            if ($parentDCA['config']['dataContainer'] !== 'General') {
+            if ($parentDCA['config']['dataContainer'] !== General::class) {
                 $idParameter                                                        =
                     $parentDCA['list']['operations'][$operationName]['idparam'];
                 $parentDCA['list']['operations'][$operationName]['button_callback'] =
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel.php
index 26a9dd74f..fcf98fa2f 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel.php
@@ -26,9 +26,11 @@
  * @filesource
  */
 
+use ContaoCommunityAlliance\DcGeneral\DC\General;
+
 $GLOBALS['TL_DCA']['tl_metamodel'] = [
     'config'          => [
-        'dataContainer'    => 'General',
+        'dataContainer'    => General::class,
         'switchToEdit'     => true,
         'enableVersioning' => false,
         'sql'              => [
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_attribute.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_attribute.php
index c9f299c6b..f90843248 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel_attribute.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel_attribute.php
@@ -23,9 +23,11 @@
  * @filesource
  */
 
+use ContaoCommunityAlliance\DcGeneral\DC\General;
+
 $GLOBALS['TL_DCA']['tl_metamodel_attribute'] = [
     'config'       => [
-        'dataContainer'    => 'General',
+        'dataContainer'    => General::class,
         'ptable'           => 'tl_metamodel',
         'switchToEdit'     => false,
         'enableVersioning' => false,
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca.php
index 5a09072df..4992b0fab 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca.php
@@ -27,10 +27,11 @@
  */
 
 use Contao\System;
+use ContaoCommunityAlliance\DcGeneral\DC\General;
 
 $GLOBALS['TL_DCA']['tl_metamodel_dca'] = [
     'config'                => [
-        'dataContainer'    => 'General',
+        'dataContainer'    => General::class,
         'ptable'           => 'tl_metamodel',
         'switchToEdit'     => false,
         'enableVersioning' => false,
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca_combine.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca_combine.php
index 2a68ac4f3..568019ed5 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca_combine.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca_combine.php
@@ -22,9 +22,11 @@
  * @filesource
  */
 
+use ContaoCommunityAlliance\DcGeneral\DC\General;
+
 $GLOBALS['TL_DCA']['tl_metamodel_dca_combine'] = [
     'config'     => [
-        'dataContainer'    => 'General',
+        'dataContainer'    => General::class,
         'ptable'           => 'tl_metamodel',
         'switchToEdit'     => false,
         'enableVersioning' => false,
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca_sortgroup.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca_sortgroup.php
index 12972a234..b2041b22b 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca_sortgroup.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel_dca_sortgroup.php
@@ -22,9 +22,11 @@
  * @filesource
  */
 
+use ContaoCommunityAlliance\DcGeneral\DC\General;
+
 $GLOBALS['TL_DCA']['tl_metamodel_dca_sortgroup'] = [
     'config'                => [
-        'dataContainer'    => 'General',
+        'dataContainer'    => General::class,
         'ptable'           => 'tl_metamodel_dca',
         'switchToEdit'     => false,
         'enableVersioning' => false,
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_dcasetting.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_dcasetting.php
index 444f46d4b..c44095bf5 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel_dcasetting.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel_dcasetting.php
@@ -26,9 +26,11 @@
  * @filesource
  */
 
+use ContaoCommunityAlliance\DcGeneral\DC\General;
+
 $GLOBALS['TL_DCA']['tl_metamodel_dcasetting'] = [
     'config'                => [
-        'dataContainer'    => 'General',
+        'dataContainer'    => General::class,
         'switchToEdit'     => true,
         'enableVersioning' => false,
         'sql'              => [
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_item.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_item.php
index d59a381c3..06a488813 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel_item.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel_item.php
@@ -26,9 +26,12 @@
     This file defines the basic structure of ALL MetaModel items.
     Note however, that various MetaModel extensions might remove or add stuff here.
 */
+
+use ContaoCommunityAlliance\DcGeneral\DC\General;
+
 $GLOBALS['TL_DCA']['tl_metamodel_item'] = [
     'config'     => [
-        'dataContainer'    => 'General',
+        'dataContainer'    => General::class,
         'switchToEdit'     => false,
         'enableVersioning' => false,
     ],
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_rendersetting.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_rendersetting.php
index 37df43c04..6447f60d6 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel_rendersetting.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel_rendersetting.php
@@ -25,9 +25,11 @@
  * @filesource
  */
 
+use ContaoCommunityAlliance\DcGeneral\DC\General;
+
 $GLOBALS['TL_DCA']['tl_metamodel_rendersetting'] = [
     'config'       => [
-        'dataContainer'    => 'General',
+        'dataContainer'    => General::class,
         'ptable'           => 'tl_metamodel_rendersettings',
         'switchToEdit'     => true,
         'enableVersioning' => false,
diff --git a/src/CoreBundle/Resources/contao/dca/tl_metamodel_rendersettings.php b/src/CoreBundle/Resources/contao/dca/tl_metamodel_rendersettings.php
index f5891d292..814fd3a52 100644
--- a/src/CoreBundle/Resources/contao/dca/tl_metamodel_rendersettings.php
+++ b/src/CoreBundle/Resources/contao/dca/tl_metamodel_rendersettings.php
@@ -27,6 +27,7 @@
  */
 
 use ContaoCommunityAlliance\DcGeneral\DC\General;
+use MetaModels\CoreBundle\Contao\Hooks\ContentElementCallback;
 
 $GLOBALS['TL_DCA']['tl_metamodel_rendersettings'] = [
     'config'       => [
@@ -320,8 +321,9 @@
                         'eval'        => [
                             'tl_class'           => 'jumpTo_filter',
                             'includeBlankOption' => true,
-                            'chosen'             => true
-                        ]
+                            'chosen'             => true,
+                            'submitOnChange'     => true,
+                        ],
                     ],
                 ],
             ],