                    (org-agenda-files
                     '("~/org/mobile/todo.org"))
                    (org-agenda-skip-function
-                    '(pjs-org-agenda-skip-entry-if 'notpriority 65 'tag "WAITING"))))
-       (tags-todo "TOREAD"
-                  ((org-agenda-overriding-header "==Reading queue=================================================================================================================================================================================")
-                   (org-agenda-max-entries 10)))
-       (tags-todo "TOWATCH"
-                  ((org-agenda-overriding-header "==Watch queue===================================================================================================================================================================================")
-                   (org-agenda-max-entries 10)))
-       (tags-todo "TOLISTEN"
-                  ((org-agenda-overriding-header "==Listen queue==================================================================================================================================================================================")
-                   (org-agenda-max-entries 10))))
+                    '(pjs-org-agenda-skip-entry-if 'notpriority 65 'tag "WAITING" 'scheduled 'deadline 'active))))
+       (tags "*"
+             ((org-agenda-overriding-header "==Reading queue=================================================================================================================================================================================")
+              (org-agenda-max-entries 10)
+              (org-agenda-skip-function
+               '(pjs-org-agenda-skip-entry-if 'nottag "TOREAD"))))
+       (tags "TOWATCH"
+             ((org-agenda-overriding-header "==Watch queue===================================================================================================================================================================================")
+              (org-agenda-max-entries 10)
+              (org-agenda-skip-function
+               '(pjs-org-agenda-skip-entry-if 'nottag "TOWATCH"))))
+       (tags "*"
+             ((org-agenda-overriding-header "==Listen queue==================================================================================================================================================================================")
+              (org-agenda-max-entries 10)
+              (org-agenda-skip-function
+               '(pjs-org-agenda-skip-entry-if 'nottag "TOLISTEN")))))
       nil nil)
-     ("aw" "Weekly review agenda; agenda for past week, completed entries, stuck projects, someday entries, maybe entries, hold entries"
+     ("aw" "Weekly review agenda; agenda for past week, waiting, archivable, stuck projects, someday, maybe, hold"
       ((agenda ""
                ((org-agenda-span 'week)
                 (org-agenda-start-day "-7d")

                 '(pjs-org-agenda-skip-subtree-if 'tag
                                                  '("NOTE" "REVIEW")
                                                  'todo 'done))))
       (tags "FLAGGED|CATEGORY=\"IN\"+SCHEDULED=\"\"+DEADLINE=\"\""
             ((org-agenda-overriding-header "Inbox:"))))
      nil nil)
     ("d" "Daily agenda"
      ((agenda ""
               ((org-agenda-span 'day)

                 (pjs-org-agenda-skip-entry-if 'notstuck 15 nil)))
              (org-agenda-max-entries 15)))
       (tags-todo "*"
                  ((org-agenda-overriding-header "==Someday=======================================================================================================================================================================================")
                   (org-agenda-skip-function
                    '(pjs-org-agenda-skip-entry-if 'nottag "SOMEDAY" 'project))))
       (tags-todo "*"
                  ((org-agenda-overriding-header "==Maybe=========================================================================================================================================================================================")
                   (org-agenda-skip-function
                    '(pjs-org-agenda-skip-entry-if 'nottag "MAYBE" 'project))))
       (tags-todo "*"
                  ((org-agenda-overriding-header "==Hold==========================================================================================================================================================================================")
                   (org-agenda-skip-function
                    '(pjs-org-agenda-skip-entry-if 'nottag '"HOLD" 'project)))))
      nil nil)
