diff --git a/module/dca/tl_leaflet_control.php b/module/dca/tl_leaflet_control.php
index ca68a48..c27cbed 100644
--- a/module/dca/tl_leaflet_control.php
+++ b/module/dca/tl_leaflet_control.php
@@ -12,7 +12,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
         (
             'keys' => array
             (
-                'id' => 'primary'
+                'id'    => 'primary',
+                'pid'   => 'index',
+                'alias' => 'unique',
             )
         )
     ),
@@ -152,7 +154,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
             'exclude'   => true,
             'inputType' => 'text',
             'search'    => true,
-            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
+            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'       => "varchar(255) NOT NULL default ''"
         ),
         'type'   => array
diff --git a/module/dca/tl_leaflet_icon.php b/module/dca/tl_leaflet_icon.php
index 6117f61..f51a92e 100644
--- a/module/dca/tl_leaflet_icon.php
+++ b/module/dca/tl_leaflet_icon.php
@@ -9,7 +9,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
         (
             'keys' => array
             (
-                'id' => 'primary'
+                'id'    => 'primary',
+                'alias' => 'unique',
             )
         )
     ),
@@ -143,10 +144,6 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
         (
             'sql' => "int(10) unsigned NOT NULL default '0'"
         ),
-        'pid'          => array
-        (
-            'sql' => "int(10) unsigned NOT NULL default '0'"
-        ),
         'title'        => array
         (
             'label'     => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['title'],
@@ -160,7 +157,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
             'label'     => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['alias'],
             'exclude'   => true,
             'inputType' => 'text',
-            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
+            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'       => "varchar(255) NOT NULL default ''"
         ),
         'type'                  => array
diff --git a/module/dca/tl_leaflet_layer.php b/module/dca/tl_leaflet_layer.php
index 5d07629..53fcf30 100644
--- a/module/dca/tl_leaflet_layer.php
+++ b/module/dca/tl_leaflet_layer.php
@@ -11,7 +11,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
         (
             'keys' => array
             (
-                'id' => 'primary'
+                'id'    => 'primary',
+                'pid'   => 'index',
+                'alias' => 'unique',
             )
         )
     ),
@@ -186,7 +188,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
             'exclude'   => true,
             'inputType' => 'text',
             'search'    => true,
-            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
+            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'       => "varchar(255) NOT NULL default ''"
         ),
         'type'                  => array
diff --git a/module/dca/tl_leaflet_map.php b/module/dca/tl_leaflet_map.php
index d26aa0f..321ca96 100644
--- a/module/dca/tl_leaflet_map.php
+++ b/module/dca/tl_leaflet_map.php
@@ -10,7 +10,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
         (
             'keys' => array
             (
-                'id' => 'primary'
+                'id'    => 'primary',
+                'alias' => 'unique',
             )
         )
     ),
@@ -132,7 +133,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
             'exclude'   => true,
             'inputType' => 'text',
             'search'    => true,
-            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
+            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'       => "varchar(255) NOT NULL default ''"
         ),
         'center'  => array
@@ -346,7 +347,6 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
             'label'     => &$GLOBALS['TL_LANG']['tl_leaflet_map']['options'],
             'exclude'   => true,
             'inputType' => 'textarea',
-            'default'   => true,
             'eval'      => array('tl_class' => 'clr lng', 'allowHtml'=>true, 'style' => 'min-height: 40px;'),
             'sql'       => "char(1) NOT NULL default ''"
         ),
diff --git a/module/dca/tl_leaflet_marker.php b/module/dca/tl_leaflet_marker.php
index f67aea6..e95b2d0 100644
--- a/module/dca/tl_leaflet_marker.php
+++ b/module/dca/tl_leaflet_marker.php
@@ -13,7 +13,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
         (
             'keys' => array
             (
-                'id' => 'primary'
+                'id'    => 'primary',
+                'pid'   => 'index',
+                'alias' => 'unique',
             )
         ),
     ),
@@ -150,7 +152,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
             'exclude'   => true,
             'inputType' => 'text',
             'search'    => true,
-            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
+            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'       => "varchar(255) NOT NULL default ''"
         ),
         'coordinates'  => array
diff --git a/module/dca/tl_leaflet_style.php b/module/dca/tl_leaflet_style.php
index fa4dd82..c142560 100644
--- a/module/dca/tl_leaflet_style.php
+++ b/module/dca/tl_leaflet_style.php
@@ -9,7 +9,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array
         (
             'keys' => array
             (
-                'id' => 'primary'
+                'id'    => 'primary',
+                'alias' => 'unique',
             )
         )
     ),
diff --git a/module/dca/tl_leaflet_vector.php b/module/dca/tl_leaflet_vector.php
index 2fbe1ed..beb2372 100644
--- a/module/dca/tl_leaflet_vector.php
+++ b/module/dca/tl_leaflet_vector.php
@@ -12,7 +12,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
         (
             'keys' => array
             (
-                'id' => 'primary'
+                'id'    => 'primary',
+                'pid'   => 'index',
+                'alias' => 'unique',
             )
         )
     ),
@@ -176,7 +178,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
             'exclude'   => true,
             'inputType' => 'text',
             'search'    => true,
-            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
+            'eval'      => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
             'sql'       => "varchar(255) NOT NULL default ''"
         ),
         'type'                  => array