diff --git a/init.el b/init.el
index 2c67398..1197eb1 100644
--- a/init.el
+++ b/init.el
@@ -1074,9 +1074,10 @@
                    ((org-agenda-overriding-header "Deadlines")
                     (org-agenda-sorting-strategy '(deadline-up priority-down))
                     (org-deadline-warning-days 30)))
-                  (tags-todo "TODO=\"CONT\""
-                             ((org-agenda-overriding-header "WIP List (TODO=\"CONT\", all items)")
-                              (org-agenda-sorting-strategy '(priority-down category-up))))
+                  (tags-todo "TODO={CONT\\|ATTN}"
+                             ((org-agenda-overriding-header "WIP List (TODO={CONT\\\\|ATTN}, not scheduled in the future)")
+                              (org-agenda-sorting-strategy '(priority-down category-up))
+                              (org-agenda-todo-ignore-scheduled 'future)))
                   (tags-todo "TODO<>\"CONT\"-HOLD-SOMEWHEN-DATE-WAIT/-DONE"
                              ((org-agenda-overriding-header "Next Actions List (not WIP, not scheduled in the future)")
                               (org-tags-match-list-sublevels t)