diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
index efc005be0..a59220d74 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
@@ -19,7 +19,6 @@ use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -52,45 +51,39 @@ class SocialWorkTypeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
-
         if (count($data['actionType']) > 0) {
-            $clause = $qb->expr()->in('acpw.socialAction', ':actionType');
-
-            if ($where instanceof Andx) {
-                $where->add($clause);
-            } else {
-                $where = $qb->expr()->andX($clause);
-            }
-
-            $qb->setParameter('actionType', $data['actionType']);
+            $qb
+                ->andWhere($qb->expr()->in('acpw.socialAction', ':actionType'))
+                ->setParameter('actionType', $data['actionType']);
         }
 
         if (count($data['goal']) > 0) {
-            if (!in_array('goal', $qb->getAllAliases(), true)) {
-                $qb->join('acpw.goals', 'goal');
+            if (!in_array('acpw_goal', $qb->getAllAliases(), true)) {
+                $qb->join('acpw.goals', 'acpw_goal');
             }
 
-            $where->add(
-                $qb->expr()->in('goal.id', ':goals')
-            );
+            $orX = $qb->expr()->orX();
+            foreach ($data['goal'] as $goal) {
 
-            $qb->setParameter('goals', $data['goal']);
-        }
+                /** @var Goal $goal */
+                $andX = $qb->expr()->andX();
+                $andX->add($qb->expr()->eq('acpw_goal.goal', $goalId = ':goal_'.uniqid()));
+                $qb->setParameter($goalId, $goal);
 
-        if (count($data['result']) > 0) {
-            if (!in_array('result', $qb->getAllAliases(), true)) {
-                $qb->join('acpw.results', 'result');
+                if (count($data['result']) > 0) {
+                    $orXResult = $qb->expr()->orX();
+                    foreach ($data['result'] as $result) {
+
+                        /** @var Result $result */
+                        $orXResult->add($qb->expr()->isMemberOf($resultId = ':result_'.uniqid(), 'acpw_goal.results'));
+                        $qb->setParameter($resultId, $result);
+                    }
+                    $andX->add($orXResult);
+                }
+                $orX->add($andX);
             }
-
-            $where->add(
-                $qb->expr()->in('result.id', ':results')
-            );
-
-            $qb->setParameter('results', $data['result']);
+            $qb->andWhere($orX);
         }
-
-        $qb->add('where', $where);
     }
 
     public function applyOn(): string