diff --git a/Timeline/AbstractTimelineAccompanyingPeriod.php b/Timeline/AbstractTimelineAccompanyingPeriod.php
index 4f56d7e36..1814a8db3 100644
--- a/Timeline/AbstractTimelineAccompanyingPeriod.php
+++ b/Timeline/AbstractTimelineAccompanyingPeriod.php
@@ -83,8 +83,12 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
         
         return array(
             'id' => $metadata->getColumnName('id'),
-            'date' => $metadata->getColumnName('openingDate'),
             'FROM' => $metadata->getTableName(),
+            'WHERE' => sprintf('%s = %d', 
+                $this->em
+                    ->getClassMetadata('ChillPersonBundle:AccompanyingPeriod')
+                    ->getAssociationMapping('person')['joinColumns'][0]['name'],
+                $args['person']->getId())
         );
     }
 
diff --git a/Timeline/TimelineAccompanyingPeriodClosing.php b/Timeline/TimelineAccompanyingPeriodClosing.php
index e09e4d4f9..f50bf97fd 100644
--- a/Timeline/TimelineAccompanyingPeriodClosing.php
+++ b/Timeline/TimelineAccompanyingPeriodClosing.php
@@ -51,14 +51,8 @@ class TimelineAccompanyingPeriodClosing extends AbstractTimelineAccompanyingPeri
         $data = $this->basicFetchQuery($context, $args);
         
         $data['type'] = 'accompanying_period_closing';
-        $data['WHERE'] = sprintf('%s = %d AND %s IS NOT NULL', 
-                $metadata
-                    ->getAssociationMapping('person')['joinColumns'][0]['name'],
-                $args['person']->getId(),
-                $metadata
-                    ->getColumnName('closingDate')
-                );
-        
+        $data['date'] = $metadata->getColumnName('closingDate');
+            
         return $data;
     }
 
diff --git a/Timeline/TimelineAccompanyingPeriodOpening.php b/Timeline/TimelineAccompanyingPeriodOpening.php
index 91f6272d3..f8789b088 100644
--- a/Timeline/TimelineAccompanyingPeriodOpening.php
+++ b/Timeline/TimelineAccompanyingPeriodOpening.php
@@ -45,15 +45,13 @@ class TimelineAccompanyingPeriodOpening extends AbstractTimelineAccompanyingPeri
      */
     public function fetchQuery($context, array $args)
     {
+        $metadata = $this->em
+                    ->getClassMetadata('ChillPersonBundle:AccompanyingPeriod');
         
         $data = $this->basicFetchQuery($context, $args);
         
         $data['type'] = 'accompanying_period_opening';
-        $data['WHERE'] = sprintf('%s = %d', 
-                $this->em
-                    ->getClassMetadata('ChillPersonBundle:AccompanyingPeriod')
-                    ->getAssociationMapping('person')['joinColumns'][0]['name'],
-                $args['person']->getId());
+        $data['date'] = $metadata->getColumnName('openingDate');
         
         return $data;
     }