diff --git a/src/Bundle/ChillMainBundle/Export/ExportManager.php b/src/Bundle/ChillMainBundle/Export/ExportManager.php
index df14a8ac8..ba15d0cc0 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportManager.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php
@@ -536,8 +536,8 @@ class ExportManager
                     . 'an ExportInterface.');
         }
 
-        if (null === $centers || [] === $centers) {
-            // we want to try if at least one center is reachable
+        if (null === $centers || [] !== $centers) {
+            // we want to try if at least one center is reachabler
             return [] !== $this->authorizationHelper->getReachableCenters(
                 $this->user,
                 $role
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
index 240da475e..2343b2bab 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -39,39 +40,23 @@ class ChildrenNumberAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition', $qb->getAllAliases(), true)) {
-            $qb->join('household.compositions', 'composition');
+        if (!in_array('composition_children', $qb->getAllAliases(), true)) {
+            $clause = $qb->expr()->andX(
+                $qb->expr()->lte('composition_children.startDate', ':ondate_composition_children'),
+                $qb->expr()->orX(
+                    $qb->expr()->gt('composition_children.endDate', ':ondate_composition_children'),
+                    $qb->expr()->isNull('composition_children.endDate')
+                )
+            );
+
+            $qb->leftJoin('household.compositions', 'composition_children', Expr\Join::WITH, $clause);
         }
 
-        $qb->addSelect('composition.numberOfChildren AS childrennumber_aggregator');
+        $qb
+            ->addSelect('composition_children.numberOfChildren AS childrennumber_aggregator')
+            ->addGroupBy('childrennumber_aggregator');
 
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('childrennumber_aggregator');
-        } else {
-            $qb->groupBy('childrennumber_aggregator');
-        }
-
-        // add date in where clause
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->andX(
-            $qb->expr()->lte('composition.startDate', ':ondate'),
-            $qb->expr()->orX(
-                $qb->expr()->gt('composition.endDate', ':ondate'),
-                $qb->expr()->isNull('composition.endDate')
-            )
-        );
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+        $qb->setParameter('ondate_composition_children', $data['on_date'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string
@@ -93,12 +78,11 @@ class ChildrenNumberAggregator implements AggregatorInterface
                 return 'Number of children';
             }
 
-            return $this->translator->trans(
-                'household_composition.numberOfChildren children in household',
-                [
-                    'numberOfChildren' => $value,
-                ]
-            );
+            if (null === $value) {
+                return '';
+            }
+
+            return $value;
         };
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
index fdb18e951..7e10ea429 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
@@ -18,6 +18,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepository;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -44,39 +45,23 @@ class CompositionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition', $qb->getAllAliases(), true)) {
-            $qb->join('household.compositions', 'composition');
+        if (!in_array('composition_type', $qb->getAllAliases(), true)) {
+            $clause = $qb->expr()->andX(
+                $qb->expr()->lte('composition_type.startDate', ':ondate_composition_type'),
+                $qb->expr()->orX(
+                    $qb->expr()->gt('composition_type.endDate', ':ondate_composition_type'),
+                    $qb->expr()->isNull('composition_type.endDate')
+                )
+            );
+
+            $qb->leftJoin('household.compositions', 'composition_type', Expr\Join::WITH, $clause);
         }
 
-        $qb->addSelect('IDENTITY(composition.householdCompositionType) AS composition_aggregator');
+        $qb
+            ->addSelect('IDENTITY(composition_type.householdCompositionType) AS composition_aggregator')
+            ->addGroupBy('composition_aggregator');
 
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('composition_aggregator');
-        } else {
-            $qb->groupBy('composition_aggregator');
-        }
-
-        // add date in where clause
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->andX(
-            $qb->expr()->lte('composition.startDate', ':ondate'),
-            $qb->expr()->orX(
-                $qb->expr()->gt('composition.endDate', ':ondate'),
-                $qb->expr()->isNull('composition.endDate')
-            )
-        );
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+        $qb->setParameter('ondate_composition_type', $data['on_date'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string
@@ -98,6 +83,10 @@ class CompositionAggregator implements AggregatorInterface
                 return 'Composition';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $c = $this->typeRepository->find($value);
 
             return $this->translatableStringHelper->localize(
diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
index 18ddbaea1..106084e4f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
@@ -106,8 +106,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
             $qb->join('member.household', 'household');
         }
 
-
-        $qb->select('COUNT(DISTINCT member.household) AS export_result');
+        $qb->select('COUNT(DISTINCT household.id) AS export_result');
 
         return $qb;
     }
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
index 3d00ed36b..1ca78d669 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
@@ -18,6 +18,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -41,32 +42,24 @@ class CompositionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition', $qb->getAllAliases(), true)) {
-            $qb->join('household.compositions', 'composition');
+        if (!in_array('composition_type_filter', $qb->getAllAliases(), true)) {
+            $clause =
+                $qb->expr()->andX(
+                    $qb->expr()->lte('composition_type_filter.startDate', ':ondate_composition_type_filter'),
+                    $qb->expr()->orX(
+                        $qb->expr()->gt('composition_type_filter.endDate', ':ondate_composition_type_filter'),
+                        $qb->expr()->isNull('composition_type_filter.endDate')
+                    )
+                );
+
+            $qb->join('household.compositions', 'composition', Expr\Join::WITH, $clause);
         }
 
-        $where = $qb->getDQLPart('where');
+        $whereClause = $qb->expr()->in('composition_type_filter.householdCompositionType', ':compositions');
 
-        $clause = $qb->expr()->andX(
-            $qb->expr()->in('composition.householdCompositionType', ':compositions'),
-            $qb->expr()->andX(
-                $qb->expr()->lte('composition.startDate', ':ondate'),
-                $qb->expr()->orX(
-                    $qb->expr()->gt('composition.endDate', ':ondate'),
-                    $qb->expr()->isNull('composition.endDate')
-                )
-            )
-        );
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
+        $qb->andWhere($whereClause);
         $qb->setParameter('compositions', $data['accepted_composition']);
-        $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+        $qb->setParameter('ondate_composition_type_filter', $data['on_date'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string