diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
index 80c4bf0f0..5953f95d8 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@@ -40,7 +40,7 @@ final readonly class ActivityTypeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $exists = self::BASE_EXISTS;
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
index 4c26f1060..e95f599f7 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -29,7 +29,7 @@ class BySocialActionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialActions', 'actsocialaction');
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
index d6e066205..951234e29 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@@ -29,7 +29,7 @@ class BySocialIssueFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialIssues', 'actsocialissue');
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
index ec8eac4be..15c517e51 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php
@@ -28,7 +28,7 @@ class HasNoActivityFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
index 850b940c1..da2dfb3c3 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
@@ -81,7 +81,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $alias = 'act_period_having_act_betw_date_alias';
         $from = 'act_period_having_act_betw_date_start';
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
index 10581fae0..bc254abae 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -31,7 +31,7 @@ class ActivityDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
index cbb9664bd..d431fa260 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
@@ -88,7 +88,7 @@ final readonly class ActivityPresenceFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('activity.attendee IN (:activity_presence_filter_presences)')
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
index 158865fea..99d10cf4d 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -37,7 +37,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
index 51a54008b..184b520c5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
@@ -14,7 +14,7 @@ namespace Chill\ActivityBundle\Export\Filter;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Form\Type\PickUserOrMeDynamicType;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
@@ -31,7 +31,7 @@ class ByCreatorFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere(
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php
index 22faad415..dd87200c3 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php
@@ -41,7 +41,7 @@ final readonly class CreatorJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
index d36acbc8e..bb695d68c 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
@@ -38,7 +38,7 @@ class CreatorScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
index 55fef35cd..60923ad41 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
@@ -36,7 +36,7 @@ class EmergencyFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
index 04ddf570d..cb1f18bf8 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationFilter.php
@@ -32,7 +32,7 @@ final readonly class LocationFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb->andWhere(
             $qb->expr()->in('activity.location', ':location')
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
index 6f995ab72..073baf374 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
@@ -29,7 +29,7 @@ class LocationTypeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->join('activity.location', 'actloc');
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
index 794d24a3f..4802fc7ac 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -36,7 +36,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $join = $qb->getDQLPart('join');
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
index c52540919..673aac25e 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -40,7 +40,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         // create a subquery for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonsFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonsFilter.php
index f2fb3b945..820830e23 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonsFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonsFilter.php
@@ -34,7 +34,7 @@ final readonly class PersonsFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
index 053cd9759..ba85ff731 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
@@ -37,7 +37,7 @@ class SentReceivedFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
index 1872a211f..f5bf9f2ae 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
@@ -39,7 +39,7 @@ class UsersJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
index 017c0d803..83af6701c 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
@@ -39,7 +39,7 @@ class UsersScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
index 6f1cf86be..d96f74b7f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
@@ -39,7 +39,7 @@ class ByActivityTypeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('aside.type', ':types');
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
index a6da48a3e..4521d7a94 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByDateFilter.php
@@ -30,7 +30,7 @@ class ByDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->between(
             'aside.date',
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
index 27b09301e..9c231782e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
@@ -92,7 +92,7 @@ final readonly class ByLocationFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('aside.location', ':locations');
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
index 5da0cfe2d..8ab5d103a 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
@@ -31,7 +31,7 @@ final readonly class ByUserFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('aside.agent', ':users');
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
index 06acd3d06..3cf8d8322 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
@@ -39,7 +39,7 @@ class ByUserJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
index 08aaa083b..387cc11da 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
@@ -39,7 +39,7 @@ class ByUserScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
index cb7c2c4a7..b19ce3596 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
@@ -33,7 +33,7 @@ final readonly class AgentFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->in('cal.mainUser', ':agents');
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
index 9501eb94d..dfb450ea9 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
@@ -29,7 +29,7 @@ class BetweenDatesFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->andX(
             $qb->expr()->gte('cal.startDate', ':dateFrom'),
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
index 532ed6b0a..dbdc297a8 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/CalendarRangeFilter.php
@@ -42,7 +42,7 @@ class CalendarRangeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (null !== $data['hasCalendarRange']) {
             $qb->andWhere($qb->expr()->isNotNull('cal.calendarRange'));
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
index d122ccf79..1885d6dcb 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
@@ -38,7 +38,7 @@ final readonly class JobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
index b83e83253..447d3750e 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
@@ -40,7 +40,7 @@ class ScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillEventBundle/Export/Filter/EventDateFilter.php b/src/Bundle/ChillEventBundle/Export/Filter/EventDateFilter.php
index a1115ade8..e7b245fbc 100644
--- a/src/Bundle/ChillEventBundle/Export/Filter/EventDateFilter.php
+++ b/src/Bundle/ChillEventBundle/Export/Filter/EventDateFilter.php
@@ -31,7 +31,7 @@ class EventDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(
diff --git a/src/Bundle/ChillEventBundle/Export/Filter/EventTypeFilter.php b/src/Bundle/ChillEventBundle/Export/Filter/EventTypeFilter.php
index c40a3f020..5314a0bc6 100644
--- a/src/Bundle/ChillEventBundle/Export/Filter/EventTypeFilter.php
+++ b/src/Bundle/ChillEventBundle/Export/Filter/EventTypeFilter.php
@@ -37,7 +37,7 @@ class EventTypeFilter implements ExportElementValidatedInterface, FilterInterfac
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('event.type', ':selected_event_types');
 
diff --git a/src/Bundle/ChillEventBundle/Export/Filter/RoleFilter.php b/src/Bundle/ChillEventBundle/Export/Filter/RoleFilter.php
index de53977d1..4ef2ec2aa 100644
--- a/src/Bundle/ChillEventBundle/Export/Filter/RoleFilter.php
+++ b/src/Bundle/ChillEventBundle/Export/Filter/RoleFilter.php
@@ -37,7 +37,7 @@ class RoleFilter implements ExportElementValidatedInterface, FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('event_part.role', ':selected_part_roles');
 
diff --git a/src/Bundle/ChillMainBundle/Export/FilterInterface.php b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
index bfe0aecda..858726437 100644
--- a/src/Bundle/ChillMainBundle/Export/FilterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
@@ -81,7 +81,6 @@ interface FilterInterface extends ModifierInterface
      * Example: `array('my string with %parameter%', ['%parameter%' => 'good news'], 'mydomain', 'mylocale')`
      *
      * @param D $data
-     * @param ExportGenerationContext $context
      *
      * @return array|string|TranslatableInterface a string with the data or, if translatable, an array where first element is string, second elements is an array of arguments
      */
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
index 40348c6a2..809e6bf09 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export\Formatter;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\ExportManagerAwareInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
@@ -111,8 +112,8 @@ class CSVListFormatter implements FormatterInterface, ExportManagerAwareInterfac
      * @param mixed[] $result          The result, as given by the ExportInterface
      * @param mixed[] $formatterData   collected from the current form
      * @param string  $exportAlias     the id of the current export
-     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
      * @param array   $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
      *
      * @return Response The response to be shown
      */
@@ -123,6 +124,7 @@ class CSVListFormatter implements FormatterInterface, ExportManagerAwareInterfac
         array $exportData,
         array $filtersData,
         array $aggregatorsData,
+        ExportGenerationContext $context,
     ) {
         $this->result = $result;
         $this->exportAlias = $exportAlias;
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
index 36937eee2..8a02dd48c 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export\Formatter;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\ExportManagerAwareInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
@@ -108,8 +109,8 @@ class CSVPivotedListFormatter implements FormatterInterface, ExportManagerAwareI
      * @param mixed[] $result          The result, as given by the ExportInterface
      * @param mixed[] $formatterData   collected from the current form
      * @param string  $exportAlias     the id of the current export
-     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
      * @param array   $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
      *
      * @return Response The response to be shown
      */
@@ -120,6 +121,7 @@ class CSVPivotedListFormatter implements FormatterInterface, ExportManagerAwareI
         array $exportData,
         array $filtersData,
         array $aggregatorsData,
+        ExportGenerationContext $context,
     ) {
         $this->result = $result;
         $this->exportAlias = $exportAlias;
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
index e5bfab68f..330231f8e 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export\Formatter;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\ExportManagerAwareInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
@@ -184,6 +185,7 @@ class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwareInte
         array $exportData,
         array $filtersData,
         array $aggregatorsData,
+        ExportGenerationContext $context,
     ): Response {
         // store all data when the process is initiated
         $this->result = $result;
@@ -204,7 +206,7 @@ class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwareInte
         );
 
         $this->tempfile = \tempnam(\sys_get_temp_dir(), '');
-        $this->generateContent();
+        $this->generateContent($context);
 
         $f = \fopen($this->tempfile, 'rb');
         $response->setContent(\stream_get_contents($f));
@@ -243,13 +245,13 @@ class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwareInte
      *
      * @return int the line number after the last description
      */
-    protected function addFiltersDescription(Worksheet &$worksheet)
+    protected function addFiltersDescription(Worksheet &$worksheet, ExportGenerationContext $context)
     {
         $line = 3;
 
         foreach ($this->filtersData as $alias => $data) {
             $filter = $this->getExportManager()->getFilter($alias);
-            $description = $filter->describeAction($data);
+            $description = $filter->describeAction($data, $context);
             if (\is_array($description)) {
                 $description = $this->translator
                     ->trans(
@@ -336,12 +338,12 @@ class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwareInte
     /**
      * Generate the content and write it to php://temp.
      */
-    protected function generateContent()
+    protected function generateContent(ExportGenerationContext $context)
     {
         [$spreadsheet, $worksheet] = $this->createSpreadsheet();
 
         $this->addTitleToWorkSheet($worksheet);
-        $line = $this->addFiltersDescription($worksheet);
+        $line = $this->addFiltersDescription($worksheet, $context);
 
         // at this point, we are going to sort retsults for an easier manipulation
         [$sortedResult, $exportKeys, $aggregatorKeys, $globalKeys] =
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
index bf600f220..c2c56df39 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export\Formatter;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\ExportManagerAwareInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
@@ -118,8 +119,8 @@ class SpreadsheetListFormatter implements FormatterInterface, ExportManagerAware
      * @param mixed[] $result          The result, as given by the ExportInterface
      * @param mixed[] $formatterData   collected from the current form
      * @param string  $exportAlias     the id of the current export
-     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
      * @param array   $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
+     * @param array   $filtersData     an array containing the filters data. The key are the filters id, and the value are the data
      *
      * @return Response The response to be shown
      */
@@ -130,6 +131,7 @@ class SpreadsheetListFormatter implements FormatterInterface, ExportManagerAware
         array $exportData,
         array $filtersData,
         array $aggregatorsData,
+        ExportGenerationContext $context,
     ) {
         $this->result = $result;
         $this->exportAlias = $exportAlias;
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
index 5d7a2b4ad..6004a6012 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
@@ -401,7 +401,7 @@ class DummyFilterWithApplying implements FilterInterface
         return $this->role;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void {}
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void {}
 
     public function applyOn(): string
     {
@@ -466,7 +466,7 @@ class DummyExport implements ExportInterface
         return [];
     }
 
-    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return [];
     }
@@ -476,7 +476,7 @@ class DummyExport implements ExportInterface
         return 'dummy';
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): QueryBuilder
     {
         throw new \RuntimeException('not implemented');
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Export/SortExportElementTest.php b/src/Bundle/ChillMainBundle/Tests/Export/SortExportElementTest.php
index 078e80112..a43d643dd 100644
--- a/src/Bundle/ChillMainBundle/Tests/Export/SortExportElementTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Export/SortExportElementTest.php
@@ -167,7 +167,7 @@ class SortExportElementTest extends KernelTestCase
                 return null;
             }
 
-            public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void {}
+            public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void {}
 
             public function applyOn(): string
             {
@@ -218,7 +218,7 @@ class SortExportElementTest extends KernelTestCase
                 return null;
             }
 
-            public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void {}
+            public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void {}
 
             public function applyOn(): string
             {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
index 45a298563..f0571bc32 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
@@ -30,7 +30,7 @@ class ActiveOnDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
index 6ae5ff340..1a319b3ea 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
@@ -29,7 +29,7 @@ class ActiveOneDayBetweenDatesFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = "OVERLAPSI (acp.openingDate, acp.closingDate), (:datefrom, :dateto) = 'TRUE'";
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
index c1332fee9..cd502421e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
@@ -31,7 +31,7 @@ final readonly class AdministrativeLocationFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('acp.administrativeLocation', ':locations');
         $qb
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
index d7ad4169b..3813a780f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
@@ -33,7 +33,7 @@ final readonly class ClosingMotiveFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->in('acp.closingMotive', ':closingmotive');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
index cd152ff5e..bfd454eea 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
@@ -36,7 +36,7 @@ class ConfidentialFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->eq('acp.confidential', ':confidential');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
index 1832f0cb5..9a0095ac0 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php
@@ -32,7 +32,7 @@ final readonly class CreatorFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acp_creator', $qb->getAllAliases(), true)) {
             $qb->join('acp.createdBy', 'acp_creator');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
index c1f5e7bf8..45bdfc15d 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php
@@ -39,7 +39,7 @@ final readonly class CreatorJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
index 49efb5a5f..516996f44 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
@@ -36,7 +36,7 @@ class EmergencyFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->eq('acp.emergency', ':emergency');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
index 8c555f3e0..f50b2eedc 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
@@ -32,7 +32,7 @@ final readonly class EvaluationFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             $qb->join('acp.works', 'acpw');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
index 2a6affb87..48fccb882 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
@@ -46,7 +46,7 @@ class GeographicalUnitStatFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $subQueryDql =
             'SELECT
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HandlingThirdPartyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HandlingThirdPartyFilter.php
index dccda1581..eb3376247 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HandlingThirdPartyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HandlingThirdPartyFilter.php
@@ -86,7 +86,7 @@ final readonly class HandlingThirdPartyFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
index add0e5666..7a87a10b2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
@@ -25,7 +25,7 @@ class HasNoActionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb->andWhere('NOT EXISTS (SELECT 1 FROM '.AccompanyingPeriodWork::class.' work WHERE work.accompanyingPeriod = acp)');
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
index cc40fd4a3..9724ea9ed 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
@@ -30,7 +30,7 @@ class HasNoReferrerFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
index e749574b5..64e319f35 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php
@@ -30,7 +30,7 @@ class HasTemporaryLocationFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->join('acp.locationHistories', 'acp_having_temporarily_location')
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php
index 439df1de9..37e6648a1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php
@@ -84,7 +84,7 @@ final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $ai = 'having_ai_within_interval_acc_info';
         $as = 'having_ai_within_interval_start_date';
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
index 9a5221bda..7a48fe635 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
@@ -36,7 +36,7 @@ class IntensityFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->eq('acp.intensity', ':intensity');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php
index b6601e27c..80a0b2fed 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php
@@ -48,7 +48,7 @@ readonly class JobWorkingOnCourseFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilter.php
index d73af9fc5..4fc2af355 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilter.php
@@ -78,7 +78,7 @@ final readonly class NotAssociatedWithAReferenceAddressFilter implements FilterI
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $k = 'acp_not_associated_ref_filter';
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
index 54887d990..d116f3d5c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
@@ -30,7 +30,7 @@ class OpenBetweenDatesFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->andX(
             $qb->expr()->gte('acp.openingDate', ':datefrom'),
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
index ad1dc1753..b0b2093bd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
@@ -33,7 +33,7 @@ final readonly class OriginFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->in('acp.origin', ':origin');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
index ff952b049..b00cd6b46 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
@@ -39,7 +39,7 @@ final readonly class ReferrerFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->join('acp.userHistories', self::A)
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDates.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDates.php
index 15fde0f9c..bd2b423c1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDates.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDates.php
@@ -53,7 +53,7 @@ final readonly class ReferrerFilterBetweenDates implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $history = self::A;
         $start = self::P;
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
index f5ca5a2d2..8fa1ae766 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
@@ -39,7 +39,7 @@ final readonly class RequestorFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php
index 46e135558..f2240ae2c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php
@@ -48,7 +48,7 @@ readonly class ScopeWorkingOnCourseFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
index edc9620c3..fbd5ef295 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
@@ -39,7 +39,7 @@ final readonly class SocialActionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
index 7caf2b2ca..a1a9c9a3e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
@@ -41,7 +41,7 @@ class SocialIssueFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acpsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('acp.socialIssues', 'acpsocialissue');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php
index 19c675fc6..176fa99d1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php
@@ -47,7 +47,7 @@ class StepFilterBetweenDates implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $alias = 'acp_filter_by_step_between_dat_alias';
         $steps = 'acp_filter_by_step_between_dat_steps';
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
index 33275111d..54cdbd0dd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
@@ -54,7 +54,7 @@ class StepFilterOnDate implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array(self::A, $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.stepHistories', self::A);
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
index 206d6edb2..6e2273502 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php
@@ -46,7 +46,7 @@ final readonly class UserJobFilter implements FilterInterface, DataTransformerIn
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
index 583200c35..cc7ca465f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
@@ -44,7 +44,7 @@ final readonly class UserScopeFilter implements FilterInterface, DataTransformer
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php
index eb3213007..49227950c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php
@@ -107,7 +107,7 @@ final readonly class UserWorkingOnCourseFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $ai_alias = 'user_working_on_course_filter_acc_info';
         $ai_users = 'user_working_on_course_filter_users';
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilter.php
index 32262793a..79f5288fa 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilter.php
@@ -91,7 +91,7 @@ final readonly class ByDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $startDate = 'acp_step_history_by_date_start_filter';
         $endDate = 'acp_step_history_by_date_end_filter';
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilter.php
index 191c97f5a..0ead9d2c5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilter.php
@@ -88,7 +88,7 @@ final readonly class ByStepFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('acpstephistory.step IN (:acpstephistory_by_step_filter_steps)')
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
index 284193853..e3b254295 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
@@ -29,7 +29,7 @@ class ByEndDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('workeval.endDate BETWEEN :work_eval_by_end_date_start_date and :work_eval_by_end_date_end_date')
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
index 00d3cabd0..206597ef6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
@@ -29,7 +29,7 @@ class ByStartDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('workeval.startDate BETWEEN :work_eval_by_start_date_start_date and :work_eval_by_start_date_end_date')
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
index fb063c105..11302acc4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
@@ -24,7 +24,7 @@ class CurrentEvaluationsFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb->andWhere('workeval.endDate IS NULL');
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
index e3849b67b..ceed94352 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
@@ -32,7 +32,7 @@ final readonly class EvaluationTypeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb->andWhere(
             $qb->expr()->in('workeval.evaluation', ':evaluationtype')
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
index 283023cd6..3c67e7f66 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
@@ -33,7 +33,7 @@ class MaxDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (true === $data['maxdate']) {
             $clause = $qb->expr()->isNotNull('workeval.maxDate');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
index 5db7ff58f..0a1b6c3f2 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
@@ -40,7 +40,7 @@ readonly class CompositionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         // there is no test on the aliases here: the name should be unique
         $clause =
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
index 1e1b53d4a..b46eb2853 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php
@@ -31,7 +31,7 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $subQuery =
             'SELECT 1
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
index 43f816036..475e3a9fc 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
@@ -33,7 +33,7 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
index b2d34e8e1..55eb45211 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php
@@ -32,7 +32,7 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
index 181acc2ee..fb88a0087 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php
@@ -39,7 +39,7 @@ class ByHouseholdCompositionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = 'person_by_household_compo_filter';
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
index 093fe7e45..f224e16c4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php
@@ -31,7 +31,7 @@ class DeadOrAliveFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
index 3f3c41754..2d4420490 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeathdateFilter.php
@@ -32,7 +32,7 @@ class DeathdateFilter implements ExportElementValidatedInterface, FilterInterfac
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
index c0d711f91..6b73275cd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
@@ -42,7 +42,7 @@ class GenderFilter implements
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $isIn = $qb->expr()->in('person.gender', ':person_gender');
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
index b7e4b57dc..d06604af4 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GeographicalUnitFilter.php
@@ -40,7 +40,7 @@ final readonly class GeographicalUnitFilter implements \Chill\MainBundle\Export\
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $subQuery =
             'SELECT 1
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
index 06581b2f3..f7c8865a5 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php
@@ -30,7 +30,7 @@ final readonly class MaritalStatusFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb->andWhere(
             $qb->expr()->in('person.maritalStatus', ':maritalStatus')
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
index bdd4a8435..ad1818f4b 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/NationalityFilter.php
@@ -37,7 +37,7 @@ final readonly class NationalityFilter implements
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->in('person.nationality', ':person_nationality');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
index 1805bc831..36f62e3c9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
@@ -41,7 +41,7 @@ final readonly class ResidentialAddressAtThirdpartyFilter implements FilterInter
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('resaddr', $qb->getAllAliases(), true)) {
             $qb->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
index b496c8d02..12b6fac8e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
@@ -31,7 +31,7 @@ class ResidentialAddressAtUserFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('resaddr', $qb->getAllAliases(), true)) {
             $qb->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person');
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilter.php
index 9334cbdf9..792851137 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilter.php
@@ -33,7 +33,7 @@ final readonly class WithParticipationBetweenDatesFilter implements FilterInterf
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = 'with_participation_between_dates_filter';
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
index a5bd0ced5..340aa041f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutHouseholdComposition.php
@@ -32,7 +32,7 @@ class WithoutHouseholdComposition implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = 'person_by_household_no_compo_filter';
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutParticipationBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutParticipationBetweenDatesFilter.php
index 644d0398f..fbd8f2acb 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutParticipationBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/WithoutParticipationBetweenDatesFilter.php
@@ -33,7 +33,7 @@ final readonly class WithoutParticipationBetweenDatesFilter implements FilterInt
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = 'without_participation_between_dates_filter';
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
index 4b255602f..ed8fa4699 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
@@ -83,7 +83,7 @@ final readonly class AccompanyingPeriodWorkEndDateBetweenDateFilter implements F
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $as = 'acc_pe_work_end_between_filter_start';
         $ae = 'acc_pe_work_end_between_filter_end';
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php
index 4fab69a91..f3911de5e 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkStartDateBetweenDateFilter.php
@@ -83,7 +83,7 @@ final readonly class AccompanyingPeriodWorkStartDateBetweenDateFilter implements
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $as = 'acc_pe_work_start_between_filter_start';
         $ae = 'acc_pe_work_start_between_filter_end';
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter.php
index 8f6a7a6e3..9bca9bc26 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter.php
@@ -79,7 +79,7 @@ final readonly class AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter impl
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $s = 'workeval_between_filter_start';
         $e = 'workeval_between_filter_end';
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorFilter.php
index 71e86e3f9..728a9948a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorFilter.php
@@ -33,7 +33,7 @@ final readonly class CreatorFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorJobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorJobFilter.php
index af8936582..fe6eac7e9 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorJobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorJobFilter.php
@@ -38,7 +38,7 @@ final readonly class CreatorJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorScopeFilter.php
index 1a9e68100..d6185c287 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorScopeFilter.php
@@ -38,7 +38,7 @@ class CreatorScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
index 093559e6d..38da6bd7c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
@@ -24,7 +24,7 @@ class CurrentActionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb->andWhere('acpw.endDate IS NULL');
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
index 95e8bccfd..4da612506 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
@@ -38,7 +38,7 @@ final readonly class JobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
index 5911b8d71..7f63ba28a 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
@@ -34,7 +34,7 @@ final readonly class ReferrerFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
index d7dcc5398..42c666879 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
@@ -38,7 +38,7 @@ final readonly class ScopeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
index 57e5337aa..1677d133c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
@@ -34,7 +34,7 @@ class SocialWorkTypeFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (\count($data['actionType']) > 0) {
             $qb
diff --git a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
index 87598f8b9..bbfcdbb1b 100644
--- a/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
+++ b/src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
@@ -27,7 +27,7 @@ class ReportDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->between(