diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs
index 203a8c706..a9a017bc5 100644
--- a/src/main/frontend/db/model.cljs
+++ b/src/main/frontend/db/model.cljs
@@ -1011,14 +1011,14 @@
                          [?block :block/scheduled ?d]
                          [?block :block/deadline ?d])
                         [(get-else $ ?block :block/repeated? false) ?repeated]
-                        [(get-else $ ?block :block/marker "DONE") ?marker]
+                        [(get-else $ ?block :block/marker "NIL") ?marker]
                         [(not= ?marker "DONE")]
                         [(not= ?marker "CANCELED")]
                         [(not= ?marker "CANCELLED")]
                         [(<= ?d ?future)]
                         (or-join [?repeated ?d ?day]
                                  [(true? ?repeated)]
-                                 [(= ?d ?day)])]
+                                 [(>= ?d ?day)])]
                date
                (+ date 7))
              react
diff --git a/src/main/frontend/version.cljs b/src/main/frontend/version.cljs
index 4ea782410..017a66a8c 100644
--- a/src/main/frontend/version.cljs
+++ b/src/main/frontend/version.cljs
@@ -1,3 +1,3 @@
 (ns frontend.version)
 
-(defonce version "0.0.15-3")
+(defonce version "0.0.15-4")