diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
index c88f1dfe3..d4dc4719d 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
@@ -20,38 +20,23 @@ use Symfony\Component\Form\FormInterface;
 use function array_key_exists;
 use function count;
 
-class ExportPickCenterDataMapper implements DataMapperInterface
+final readonly class ExportPickCenterDataMapper implements DataMapperInterface
 {
-    public function __construct(
-        private RegroupmentRepository $regroupmentRepository,
-    ) {
-    }
-
-    public function mapDataToForms($data, $forms): void
+    public function mapDataToForms($viewData, $forms): void
     {
-        if (null === $data) {
+        if (null === $viewData) {
             return;
         }
 
         /** @var array<string, FormInterface> $form */
         $form = iterator_to_array($forms);
 
-        $pickedRegroupment = [];
+        $form['center']->setData($viewData);
 
-        foreach ($this->regroupmentRepository->findAll() as $regroupment) {
-            /** @phpstan-ignore-next-line  */
-            [$contained, $notContained] = $regroupment->getCenters()->partition(static fn (int $id, Center $center): bool => false);
-
-            if (0 === count($notContained)) {
-                $pickedRegroupment[] = $regroupment;
-            }
-        }
-
-        $form['regroupment']->setData([]);
-        $form['center']->setData($data);
+        // NOTE: we do not map back the regroupments
     }
 
-    public function mapFormsToData($forms, &$data): void
+    public function mapFormsToData($forms, &$viewData): void
     {
         /** @var array<string, FormInterface> $forms */
         $forms = iterator_to_array($forms);
@@ -71,6 +56,6 @@ class ExportPickCenterDataMapper implements DataMapperInterface
             }
         }
 
-        $data = array_values($centers);
+        $viewData = array_values($centers);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
index b2d903909..d33ab2ade 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
@@ -77,7 +77,7 @@ final class PickCenterType extends AbstractType
             ]);
         }
 
-        $builder->setDataMapper(new ExportPickCenterDataMapper($this->regroupmentRepository));
+        $builder->setDataMapper(new ExportPickCenterDataMapper());
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
index 9a687b1e6..e97834319 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
@@ -113,7 +113,7 @@ class SocialWorkTypeFilter implements FilterInterface
 
     public function getFormDefaultData(): array
     {
-        return ['action_type' => '', 'goal' => '', 'result' => ''];
+        return ['action_type' => [], 'goal' => [], 'result' => []];
     }
 
     public function describeAction($data, $format = 'string'): array