Include current task in captures DATEs

init.el

@@ -1366,7 +1366,9 @@ accordingly."
                 ("d" "Date"
                      entry
                      (file db/org-default-refile-file)
-                     "* GOTO [#B] %^{What} :DATE:\n%^{When}t\n%a%?"
+                     ,(concat "* GOTO [#B] %^{What} :DATE:\n%^{When}t\n"
+                              "\nVia %(with-temp-buffer (db/org-add-link-to-current-clock) (string-trim (buffer-string))).\n"
+                              "%?")
                      :empty-lines-before 1
                      :empty-lines-after 1)
                 ("i" "Interruptions"

site-lisp/db-org.el

@@ -1258,6 +1258,7 @@ cache if that's in use."
       (let ((old-headline (org-entry-get (point) "ITEM")))
         ;; Update headline
         (org-edit-headline new-headline)
+        (org-align-tags)
 
         ;; Code to add note interactively taken from
         ;; https://sachachua.com/blog/2022/11/logging-sent-messages-to-org-mode-with-message-sent-hook/