diff --git a/src/Bundle/Resources/config/listeners.yml b/src/Bundle/Resources/config/listeners.yml
index d786162..9b24dac 100644
--- a/src/Bundle/Resources/config/listeners.yml
+++ b/src/Bundle/Resources/config/listeners.yml
@@ -33,6 +33,7 @@ services:
     arguments:
       - '@netzmacht.contao_toolkit.dca.manager'
       - '@database_connection'
+      - '@netzmacht.contao_toolkit.repository_manager'
       - '%netzmacht.contao_leaflet.controls%'
 
   netzmacht.contao_leaflet.listeners.dca.layer:
@@ -68,7 +69,7 @@ services:
       - '%netzmacht.contao_leaflet.icons%'
 
   netzmacht.contao_leaflet.listeners.dca.style:
-    class: Netzmacht\Contao\Leaflet\Listener\Dca\IconDcaListener
+    class: Netzmacht\Contao\Leaflet\Listener\Dca\StyleDcaListener
     arguments:
       - '%netzmacht.contao_leaflet.styles%'
 
diff --git a/src/Mapper/Layer/FileLayerMapper.php b/src/Mapper/Layer/FileLayerMapper.php
index 1dc9908..17a1687 100644
--- a/src/Mapper/Layer/FileLayerMapper.php
+++ b/src/Mapper/Layer/FileLayerMapper.php
@@ -128,8 +128,7 @@ class FileLayerMapper extends AbstractLayerMapper
                     return parent::createInstance($model, $mapper, $request, $elementId);
             }
 
-            $customId    = $layerId . '_data';
-            $customLayer = new GeoJson($customId);
+            $customLayer = new GeoJson($layerId);
 
             $layer->setCustomLayer($customLayer);