diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Date.php b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Date.php
index 67789ee0..b508cf28 100644
--- a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Date.php
+++ b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Date.php
@@ -30,9 +30,6 @@ namespace EP\EpProducts\Domain\Model;
 class Date extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
 {
 
-    const DURATION_SHORT = 4;
-    const DURATION_LONG = 5;
-
     /**
      * @var int
      */
diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Model/FilterSettings.php b/web/typo3conf/ext/ep_products/Classes/Domain/Model/FilterSettings.php
index 0848ad7d..118b7e61 100644
--- a/web/typo3conf/ext/ep_products/Classes/Domain/Model/FilterSettings.php
+++ b/web/typo3conf/ext/ep_products/Classes/Domain/Model/FilterSettings.php
@@ -38,6 +38,9 @@ class FilterSettings implements \JsonSerializable
     const DESTINATION_TYPE_HOTEL = 'hotel';
     const DESTINATION_TYPE_PRODUCT = 'product';
 
+    const DURATION_SHORT = 4;
+    const DURATION_LONG = 5;
+
     /**
      * @var array
      */
diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php b/web/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php
index d9a5a311..33e53872 100644
--- a/web/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php
+++ b/web/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php
@@ -27,7 +27,6 @@ namespace EP\EpProducts\Domain\Repository;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use EP\EpProducts\Domain\Model\Date;
 use EP\EpProducts\Domain\Model\FilterSettings;
 use EP\EpProducts\Traits\DbConnectionTrait;
 use TYPO3\CMS\Core\Database\Connection;
@@ -47,6 +46,7 @@ abstract class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Reposit
     }
 
     /**
+     * @param array $uids
      * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException
      */
@@ -170,7 +170,7 @@ abstract class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Reposit
         // Price range
         $priceRange = (int) $filterSettings->getPriceRange();
         if ($priceRange > 0) {
-            list($priceMin, $priceMax) = FilterSettings::$priceRanges[$priceRange];
+            [ $priceMin, $priceMax ] = FilterSettings::$priceRanges[$priceRange];
             $query
                 ->andWhere('date.min_price >= :priceMin')
                 ->andWhere('date.min_price < :priceMax')
@@ -187,12 +187,12 @@ abstract class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Reposit
     protected function addDurationFilterConditions(QueryBuilder $query, FilterSettings $filterSettings)
     {
         // Duration
-        if ((int) $filterSettings->getNights() === Date::DURATION_SHORT) {
+        if ((int) $filterSettings->getNights() === FilterSettings::DURATION_SHORT) {
             $query
                 ->andWhere('date.nights <= :nights')
                 ->setParameter('nights', $filterSettings->getNights())
             ;
-        } elseif ((int) $filterSettings->getNights() === Date::DURATION_LONG) {
+        } elseif ((int) $filterSettings->getNights() === FilterSettings::DURATION_LONG) {
             $query
                 ->andWhere('date.nights >= :nights')
                 ->setParameter('nights', $filterSettings->getNights())
diff --git a/web/typo3conf/ext/ep_products/Classes/Service/FilterService.php b/web/typo3conf/ext/ep_products/Classes/Service/FilterService.php
index cd60a442..2657eba2 100644
--- a/web/typo3conf/ext/ep_products/Classes/Service/FilterService.php
+++ b/web/typo3conf/ext/ep_products/Classes/Service/FilterService.php
@@ -124,7 +124,7 @@ class FilterService implements SingletonInterface
             }
 
             // Nights
-            $duration = (int) $row['nights'] <= 4 ? Date::DURATION_SHORT : Date::DURATION_LONG;
+            $duration = (int) $row['nights'] <= 4 ? FilterSettings::DURATION_SHORT : FilterSettings::DURATION_LONG;
 
             if (!in_array($duration, $nights)) {
                 $nights[] = $duration;