diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/FailureInformationRepository.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/FailureInformationRepository.java
index 51621ef..ceb3d30 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/FailureInformationRepository.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/FailureInformationRepository.java
@@ -33,7 +33,8 @@
 
     @Query("SELECT a from TblFailureInformation a WHERE a.tblFailureInformationCondensed IS NULL " +
             "AND ( (a.refStatusIntern.id NOT IN (:statusClosedId, :statusCancelledId) OR a.failureEndResupplied IS NULL ) OR " +
-            "(a.refStatusIntern.id IN (:statusClosedId, :statusCancelledId) AND a.failureEndResupplied >= :dateNowFourWeeksAgo) ) ORDER BY a.failureBegin ASC")
+            "(a.refStatusIntern.id = :statusClosedId AND a.failureEndResupplied >= :dateNowFourWeeksAgo) OR" +
+            "(a.refStatusIntern.id = :statusCancelledId AND a.modDate >= :dateNowFourWeeksAgo) ) ORDER BY a.failureBegin ASC")
     Page<TblFailureInformation> findByTblFailureInformationForDisplay(long statusClosedId, long statusCancelledId,
                                                                       Date dateNowFourWeeksAgo, Pageable pageable); // NOSONAR