diff --git a/src/lib/components/filter/FilterBar.svelte b/src/lib/components/filter/FilterBar.svelte
index 2791bb2..8a68b01 100644
--- a/src/lib/components/filter/FilterBar.svelte
+++ b/src/lib/components/filter/FilterBar.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 
   import { mdiClose } from "@mdi/js";
-  import { onMount } from "svelte";
 
   import { Debouncer } from "$lib/shared/util";
 
@@ -193,23 +192,8 @@
       searchDebounce.now();
     }
   }
-
-  function onWindowKeyup(e: KeyboardEvent): void {
-    // Dont catch keybinds when inputting text
-    if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) return;
-    if (e.key === "f") {
-      e.preventDefault();
-      focusInput();
-    }
-  }
-
-  onMount(() => {
-    if (hiddenIds.size === 0) activeFilters = activeFilters;
-  });
 </script>
 
-<svelte:window on:keyup={onWindowKeyup} />
-
 <div class="filterbar-outer">
   <div class="filterbar-inner input input-sm input-bordered">
     {#each activeFilters as fdata, i}
diff --git a/src/lib/components/filter/FilterChip.svelte b/src/lib/components/filter/FilterChip.svelte
index 4d869f2..260015c 100644
--- a/src/lib/components/filter/FilterChip.svelte
+++ b/src/lib/components/filter/FilterChip.svelte
@@ -41,15 +41,6 @@
     }
   } : undefined;
 
-  function acceptTextInput(e: Event): void {
-    // @ts-expect-error Event is from HTML input
-    if (e.target?.value) {
-      // @ts-expect-error Input value is checked
-      fdata.selection = { id: null, name: e.target.value };
-    }
-    stopEditing(true);
-  }
-
   $: if (fdata.editing && autocomplete) {
     autocomplete.open();
   }
@@ -127,10 +118,14 @@
           }}
           on:keypress={(e) => {
             if (e.key === "Enter") {
-              acceptTextInput(e);
+              // @ts-expect-error Input value is checked
+              if (e.target?.value) {
+                // @ts-expect-error Input value is checked
+                fdata.selection = { id: null, name: e.target.value };
+              }
+              stopEditing(true);
             }
           }}
-          on:blur={acceptTextInput}
         />
       {/if}
     {:else}
diff --git a/src/lib/components/ui/EntryTodoButton.svelte b/src/lib/components/ui/EntryTodoButton.svelte
index 8e185cc..6bedd3e 100644
--- a/src/lib/components/ui/EntryTodoButton.svelte
+++ b/src/lib/components/ui/EntryTodoButton.svelte
@@ -1,21 +1,6 @@
-<script lang="ts">
-  import { humanDate } from "$lib/shared/util";
-
-  function dateIn(n: number): string {
-    const date = new Date();
-    date.setDate(date.getDate() + n);
-    return humanDate(date);
-  }
-</script>
-
 <div class="join">
   {#each { length: 4 } as _, i}
-    <button
-      name="todo"
-      class="join-item btn btn-sm"
-      title={i > 0 ? `Eintrag auf ${dateIn(i)} verschieben` : undefined}
-      type="submit"
-      value={i}>
+    <button name="todo" class="join-item btn btn-sm" type="submit" value={i}>
       {#if i === 0}
         Notiz
       {:else}
diff --git a/src/lib/server/query/util.ts b/src/lib/server/query/util.ts
index c7782da..e10bc0d 100644
--- a/src/lib/server/query/util.ts
+++ b/src/lib/server/query/util.ts
@@ -130,10 +130,6 @@ class SearchQueryComponents {
  * Supported search syntax:
  * - Negative query `-word`
  * - Exact query `"word"`
- *
- * The last word in a search query is prefix-matched (i.e.
- * the search returns all results starting with the given characters).
- * This allows for meaningful results in Search-as-you-type applications.
  */
 export function parseSearchQuery(q: string): SearchQueryComponents {
   const regexpParts = /(-)?(?:"([^"]*)"|([^"\s]+))(?:\s|$)/g;
diff --git a/src/lib/shared/util/date.ts b/src/lib/shared/util/date.ts
index e2389f1..16d4b5f 100644
--- a/src/lib/shared/util/date.ts
+++ b/src/lib/shared/util/date.ts
@@ -77,13 +77,6 @@ function dateDiffInDays(a: Date, b: Date): number {
   return Math.round((ts2 - ts1) / MS_PER_DAY);
 }
 
-/** Format a date with a human-readable format
- * - If the date is within +/- 3 days, output a textual format ("heute", "morgen", "vor 2 Tagen")
- * - Otherwise, format it as DD.MM.YYYY (or DD.MM.YYYY, hh:mm if `time=true`)
- *
- * @param [time=false] Enable time display
- * @param [cap=false] Enable capitalized format
- */
 export function humanDate(date: Date | string, time = false, cap = false): string {
   const now = new Date();
   const dt = coerceDate(date);
@@ -103,7 +96,7 @@ export function humanDate(date: Date | string, time = false, cap = false): strin
   if (diffDays !== 0) {
     if (diffDays === 1) return outstr("morgen");
     if (diffDays === -1) return outstr("gestern");
-    return outstr(intl.format(diffDays, "day"));
+    return intl.format(diffDays, "day");
   }
 
   if (time) {
diff --git a/src/lib/shared/util/util.ts b/src/lib/shared/util/util.ts
index 836ca23..dc60691 100644
--- a/src/lib/shared/util/util.ts
+++ b/src/lib/shared/util/util.ts
@@ -158,11 +158,7 @@ export function defaultVisitUrl(): string {
   }, URL_VISIT);
 }
 
-export async function moveEntryTodoDate(
-  id:number,
-  nTodoDays: number,
-  init?: TRPCClientInit,
-): Promise<Date | null> {
+export async function moveEntryTodoDate(id: number, nTodoDays: number, init?: TRPCClientInit) {
   if (nTodoDays > 0) {
     const entry = await trpc(init).entry.get.query(id);
     const newDate = new Date();
@@ -175,7 +171,5 @@ export async function moveEntryTodoDate(
         date: utcDateToYMD(newDate),
       },
     });
-    return newDate;
   }
-  return null;
 }
diff --git a/src/routes/(app)/entry/[id]/+page.server.ts b/src/routes/(app)/entry/[id]/+page.server.ts
index 3f7e31c..49aa997 100644
--- a/src/routes/(app)/entry/[id]/+page.server.ts
+++ b/src/routes/(app)/entry/[id]/+page.server.ts
@@ -5,7 +5,7 @@ import { superValidate, message } from "sveltekit-superforms";
 
 import { ZUrlEntityId } from "$lib/shared/model/validation";
 import { trpc } from "$lib/shared/trpc";
-import { humanDate, loadWrap, moveEntryTodoDate } from "$lib/shared/util";
+import { loadWrap, moveEntryTodoDate } from "$lib/shared/util";
 
 import { SchemaNewExecution } from "./schema";
 
@@ -22,21 +22,18 @@ export const actions: Actions = {
     const done = todoDays === null;
     const nTodoDays = todoDays ? parseInt(todoDays.toString()) : 0;
 
-    if (form.data.text.length > 0) {
+    await loadWrap(async () => {
       await trpc(event).entry.newExecution.mutate({
         id,
         old_execution_id: form.data.old_execution_id,
         execution: { text: form.data.text, done: todoDays === null },
       });
-    }
-    const newTodoDate = await moveEntryTodoDate(id, nTodoDays, event);
+      await moveEntryTodoDate(id, nTodoDays, event);
+    });
 
-    if (newTodoDate) {
-      return message(form, `Eintrag auf ${humanDate(newTodoDate)} verschoben`);
+    if (nTodoDays > 0) {
+      return message(form, `Eintrag um ${nTodoDays} Tage in die Zukunft verschoben`);
     }
-    if (form.data.text.length > 0) {
-      return message(form, done ? "Eintrag erledigt" : "Eintrag mit Notiz versehen");
-    }
-    return { form };
+    return message(form, done ? "Eintrag erledigt" : "Eintrag mit Notiz versehen");
   }),
 };
diff --git a/src/routes/(app)/entry/[id]/+page.svelte b/src/routes/(app)/entry/[id]/+page.svelte
index 3616ca3..f93e323 100644
--- a/src/routes/(app)/entry/[id]/+page.svelte
+++ b/src/routes/(app)/entry/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+
   import type { PageData } from "./$types";
 
   import { superForm } from "sveltekit-superforms";
@@ -32,7 +33,7 @@
       label="Eintrag erledigen"
       bind:value={$form.text}
     >
-      <div class="row c-vlight gap-2 flex-wrap">
+      <div class="row c-vlight gap-2">
         <button class="btn btn-sm btn-primary" type="submit">Erledigt</button>
         <EntryTodoButton />
       </div>
diff --git a/src/routes/(app)/entry/[id]/editExecution/+page.server.ts b/src/routes/(app)/entry/[id]/editExecution/+page.server.ts
index 679da3b..92b9b6c 100644
--- a/src/routes/(app)/entry/[id]/editExecution/+page.server.ts
+++ b/src/routes/(app)/entry/[id]/editExecution/+page.server.ts
@@ -5,7 +5,7 @@ import { superValidate } from "sveltekit-superforms";
 
 import { ZUrlEntityId } from "$lib/shared/model/validation";
 import { trpc } from "$lib/shared/trpc";
-import { loadWrap } from "$lib/shared/util";
+import { loadWrap, moveEntryTodoDate } from "$lib/shared/util";
 
 import { SchemaNewExecution } from "../schema";
 
@@ -29,6 +29,9 @@ export const actions: Actions = {
       old_execution_id: form.data.old_execution_id,
     });
 
+    const nTodoDays = todoDays ? parseInt(todoDays.toString()) : 0;
+    await moveEntryTodoDate(id, nTodoDays, event);
+
     redirect(302, `/entry/${id}`);
   }),
 };
diff --git a/src/routes/(app)/entry/[id]/editExecution/+page.svelte b/src/routes/(app)/entry/[id]/editExecution/+page.svelte
index 971eb7a..d67ec0f 100644
--- a/src/routes/(app)/entry/[id]/editExecution/+page.svelte
+++ b/src/routes/(app)/entry/[id]/editExecution/+page.svelte
@@ -7,6 +7,7 @@
   import { superformConfig } from "$lib/shared/util";
 
   import EntryBody from "$lib/components/entry/EntryBody.svelte";
+  import EntryTodoButton from "$lib/components/ui/EntryTodoButton.svelte";
   import MarkdownInput from "$lib/components/ui/markdown/MarkdownInput.svelte";
 
   import { SchemaNewExecution } from "../schema";
@@ -31,9 +32,7 @@
   >
     <div class="row c-vlight gap-2">
       <button class="btn btn-sm btn-primary" type="submit">Speichern</button>
-      <button name="todo" class="join-item btn btn-sm" type="submit" value="0">
-        Notiz
-      </button>
+      <EntryTodoButton />
     </div>
   </MarkdownInput>
   <input name="old_execution_id" type="hidden" bind:value={$form.old_execution_id} />