diff --git a/module/config/services.php b/module/config/services.php
index 74a443e..ba823f5 100644
--- a/module/config/services.php
+++ b/module/config/services.php
@@ -53,7 +53,9 @@ $container[LeafletServices::MAP_PROVIDER] = $container->share(function ($contain
         $container[LeafletServices::DEFINITION_BUILDER],
         $container[Services::EVENT_DISPATCHER],
         $container[Services::INPUT],
-        $container[LeafletServices::MAP_ASSETS]
+        $container[LeafletServices::MAP_ASSETS],
+        $GLOBALS['LEAFLET_FILTERS'],
+        \Config::get('debugMode') || \Config::get('displayErrors')
     );
 });
 
diff --git a/src/Netzmacht/Contao/Leaflet/MapProvider.php b/src/Netzmacht/Contao/Leaflet/MapProvider.php
index f5d60d6..a848fb0 100644
--- a/src/Netzmacht/Contao/Leaflet/MapProvider.php
+++ b/src/Netzmacht/Contao/Leaflet/MapProvider.php
@@ -66,6 +66,20 @@ class MapProvider
      */
     private $assets;
 
+    /**
+     * Request filters configuration.
+     *
+     * @var array
+     */
+    private $filters;
+
+    /**
+     * Display errors setting.
+     *
+     * @var bool
+     */
+    private $displayErrors;
+
     /**
      * Construct.
      *
@@ -74,19 +88,25 @@ class MapProvider
      * @param EventDispatcher  $eventDispatcher The Contao event dispatcher.
      * @param \Input           $input           Thw request input.
      * @param Assets           $assets          Assets handler.
+     * @param array            $filters         Request filters configuration.
+     * @param bool             $displayErrors   Display errors setting.
      */
     public function __construct(
         DefinitionMapper $mapper,
         Leaflet $leaflet,
         EventDispatcher $eventDispatcher,
         \Input $input,
-        Assets $assets
+        Assets $assets,
+        array $filters,
+        $displayErrors
     ) {
         $this->mapper          = $mapper;
         $this->leaflet         = $leaflet;
         $this->eventDispatcher = $eventDispatcher;
         $this->input           = $input;
         $this->assets          = $assets;
+        $this->filters         = $filters;
+        $this->displayErrors   = $displayErrors;
     }
 
     /**
@@ -233,12 +253,7 @@ class MapProvider
                 return;
             }
 
-            $controller = new DataController(
-                $this,
-                $GLOBALS['LEAFLET_FILTERS'],
-                \Config::get('debugMode') || \Config::get('displayErrors')
-            );
-
+            $controller = new DataController($this, $this->filters, $this->displayErrors);
             $controller->execute($data);
 
             if ($exit) {