diff --git a/doom.org b/doom.org
index 52b8822..3753216 100644
--- a/doom.org
+++ b/doom.org
@@ -584,7 +584,7 @@ Archive subtrees under the same hierarchy as original in the archive files
   )
 #+end_src
 
-** Org Agenda
+** TODO [#A] Org Agenda
 General configuration
 #+begin_src emacs-lisp
 (after! org
@@ -628,19 +628,28 @@ Org Agenda Custom Views
     (org-agenda-skip-entry-if 'scheduled 'deadline 'regexp "\n]+>"))
 
   (setq org-agenda-custom-commands
-        '(("w" "Work"
-           ((org-ql-block '(and (tags "@work")
+        '(("T" "test"
+           ((org-ql-block '(planning)
+                          ((org-ql-block-header "To refill")))
+            ))
+          ("w" "Work"
+           ((org-ql-block '(and (tags "inbox"))
+                          ((org-ql-block-header "To refill")))
+            (org-ql-block '(and (scheduled)
+                                (not (done)))
+                          ((org-ql-block-header "Scheduled Tasks")))
+            (org-ql-block '(and (not (tags "@home"))
+                                (not (tags "@biblio"))
                                 (todo "TODO")
                                 (priority "A"))
-                          ((org-ql-block-header "Important TODOs")))
-            (org-ql-block '(and (tags "@work")
-                                (todo "TODO")
-                                (priority "B"))
-                          ((org-ql-block-header "TODOs")))
-            (org-ql-block '(and (tags "@work")
-                                (todo "TODO")
-                                (priority "C"))
-                          ((org-ql-block-header "Not important TODOs")))))
+                          ((org-ql-block-header "Important Tasks")))
+            (org-ql-block '(and (not (tags "@home"))
+                                (todo "DELE"))
+                          ((org-ql-block-header "Delegated Tasks")))
+            (org-ql-block '(and (not (tags "@home"))
+                                (todo "WAIT"))
+                          ((org-ql-block-header "Tasks on hold")))
+            ))
           ("h" "Home"
            ((org-ql-block '(and (tags "@home")
                                 (todo "TODO")
@@ -919,6 +928,12 @@ Do not export headline with the =:ignore:= tag:
   (ox-extras-activate '(ignore-headlines)))
 #+end_src
 
+** Org-ql
+#+begin_src emacs-lisp
+(use-package! org-ql
+  :after org)
+#+end_src
+
 ** Org Effort
 #+begin_src emacs-lisp
 (after! org