diff --git a/elisp/init-org-node.el b/elisp/init-org-node.el
index bb6107f..6d5b33a 100644
--- a/elisp/init-org-node.el
+++ b/elisp/init-org-node.el
@@ -56,28 +56,17 @@
       :super-groups '((:name "Taken" :todo))
       ))
 
-  ;; (defun my/org-node-todo-file-sort ()
-  ;;   "Toon alle TODOs uit org-bestanden, gesorteerd op bestandsnaam."
-  ;;   (interactive)
-  ;;   (org-ql-search (org-node-list-files)
-  ;;     '(todo)
-  ;;     :title "TODO's per Bestand"
-  ;;     :sort (lambda (a b) (string< (org-ql-get a 'file) (org-ql-get b 'file)))
-  ;;     :super-groups '((:name (lambda (items) (format "Bestand: %s" (org-ql-get (car items) 'file)))
-  ;;                            :all))))
+  (setq my-todo-nodes
+      (lambda (node)
+        (string= (org-node-get-todo node) "TODO")))
 
-  ;; (defun my/org-agenda-ql-todos-with-date ()
-  ;;   "Toon TODO's met een datum uit Org Roam bestanden in de agenda."
-  ;;   (interactive)
-  ;;   (org-agenda-custom-agenda
-  ;;    '(("TODOs met Datum"
-  ;;       ((org-ql-search (org-node-list-files)
-  ;;          '(:and (todo) (:or deadline scheduled))
-  ;;          :title "TODOs met Datum"
-  ;;          :sort '(date)
-  ;;          :super-groups '((:name "Vandaag" :date today)
-  ;;                          (:name "Binnenkort" :date future)
-  ;;                          (:name "Verleden" :date past))))))))
+  (setq org-agenda-custom-commands
+      '(("b" "TODO's uit Org-Node (gefilterd)"
+         ((agenda "" ((org-agenda-files (org-node-list-files))
+                      (org-agenda-filter-function
+                       (lambda (entry)
+                         (let ((node (org-entry-get-node entry)))
+                           (funcall my-todo-nodes node))))))))))
   )