diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index d7037c1d2..e2e2fbc97 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -95,6 +95,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $loader->load('services/doctrineEventListener.yaml');
         $loader->load('services/accompanyingPeriodConsistency.yaml');
 
+        //
         if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') {
             $loader->load('services/exports_accompanying_period.yaml');
         }
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports.yaml b/src/Bundle/ChillPersonBundle/config/services/exports.yaml
index 093b7315b..f50674e19 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports.yaml
@@ -1,4 +1,5 @@
 services:
+
     chill.person.export.count_person:
         class: Chill\PersonBundle\Export\Export\CountPerson
         arguments:
@@ -26,20 +27,6 @@ services:
         tags:
             - { name: chill.export, alias: list_person_duplicate }
 
-    chill.person.export.count_accompanyingcourse:
-      class: Chill\PersonBundle\Export\Export\CountAccompanyingCourse
-      arguments:
-        - "@doctrine.orm.entity_manager"
-      tags:
-        - { name: chill.export, alias: count_accompanyingcourse }
-
-    chill.person.export.avg_accompanyingcourse_duration:
-      class: Chill\PersonBundle\Export\Export\StatAccompanyingCourseDuration
-      arguments:
-        - '@Chill\PersonBundle\Repository\AccompanyingPeriodRepository'
-      tags:
-        - { name: chill.export, alias: avg_accompanyingcourse_duration }
-
     chill.person.export.filter_gender:
         class: Chill\PersonBundle\Export\Filter\GenderFilter
         arguments:
@@ -58,41 +45,6 @@ services:
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: person_nationality_filter }
-
-    chill.person.export.filter_userscope:
-      class: Chill\PersonBundle\Export\Filter\UserScopeFilter
-      autowire: true
-      autoconfigure: true
-      tags:
-        - { name: chill.export_filter, alias: accompanyingcourse_userscope_filter }
-
-    chill.person.export.filter_userjob:
-      class: Chill\PersonBundle\Export\Filter\UserJobFilter
-      autowire: true
-      autoconfigure: true
-      tags:
-        - { name: chill.export_filter, alias: accompanyingcourse_userjob_filter }
-
-    chill.person.export.filter_socialissue:
-      class: Chill\PersonBundle\Export\Filter\SocialIssueFilter
-      autowire: true
-      autoconfigure: true
-      tags:
-        - { name: chill.export_filter, alias: accompanyingcourse_socialissue_filter }
-
-    chill.person.export.filter_step:
-      class: Chill\PersonBundle\Export\Filter\StepFilter
-      autowire: true
-      autoconfigure: true
-      tags:
-        - { name: chill.export_filter, alias: accompanyingcourse_step_filter }
-
-    chill.person.export.filter_origin:
-      class: Chill\PersonBundle\Export\Filter\OriginFilter
-      autowire: true
-      autoconfigure: true
-      tags:
-        - { name: chill.export_filter, alias: accompanyingcourse_origin_filter }
             
     chill.person.export.aggregator_nationality:
         class: Chill\PersonBundle\Export\Aggregator\NationalityAggregator
diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml
index 6126af6d6..36544abde 100644
--- a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml
@@ -1,4 +1,6 @@
-services:   
+services:
+
+    ##
     chill.person.export.filter_accompanying_period:
         class: Chill\PersonBundle\Export\Filter\AccompanyingPeriodFilter
         tags:
@@ -13,3 +15,56 @@ services:
         class: Chill\PersonBundle\Export\Filter\AccompanyingPeriodClosingFilter
         tags:
             - { name: chill.export_filter, alias: person_acc_pe_cl_filter }
+
+    ## Indicators
+    chill.person.export.count_accompanyingcourse:
+        class: Chill\PersonBundle\Export\Export\CountAccompanyingCourse
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export, alias: count_accompanyingcourse }
+
+    chill.person.export.avg_accompanyingcourse_duration:
+        class: Chill\PersonBundle\Export\Export\StatAccompanyingCourseDuration
+        autowire: true
+        autoconfigure: true
+        tags:
+          - { name: chill.export, alias: avg_accompanyingcourse_duration }
+
+    ## Filters
+    chill.person.export.filter_userscope:
+        class: Chill\PersonBundle\Export\Filter\UserScopeFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_userscope_filter }
+
+    chill.person.export.filter_userjob:
+        class: Chill\PersonBundle\Export\Filter\UserJobFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_userjob_filter }
+
+    chill.person.export.filter_socialissue:
+        class: Chill\PersonBundle\Export\Filter\SocialIssueFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_socialissue_filter }
+
+    chill.person.export.filter_step:
+        class: Chill\PersonBundle\Export\Filter\StepFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_step_filter }
+
+    chill.person.export.filter_origin:
+        class: Chill\PersonBundle\Export\Filter\OriginFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_origin_filter }
+
+    ## Aggregators
\ No newline at end of file