diff --git a/backend/src/tracker/api/routes/vorlagen.py b/backend/src/tracker/api/routes/vorlagen.py
index 71a81d0..c5bfa2d 100644
--- a/backend/src/tracker/api/routes/vorlagen.py
+++ b/backend/src/tracker/api/routes/vorlagen.py
@@ -45,8 +45,16 @@ def list_vorlagen(
         params.append(typ)
 
     if suche:
-        where_clauses.append("(v.betreff LIKE ? OR v.aktenzeichen LIKE ?)")
-        params.extend([f"%{suche}%", f"%{suche}%"])
+        where_clauses.append(
+            "(v.betreff LIKE ? OR v.aktenzeichen LIKE ?"
+            " OR v.volltext_clean LIKE ?"
+            " OR v.id IN ("
+            "   SELECT kb.vorlage_id FROM ki_bewertungen kb"
+            "   WHERE kb.typ = 'zusammenfassung' AND kb.begruendung LIKE ?"
+            "))"
+        )
+        like = f"%{suche}%"
+        params.extend([like, like, like, like])
 
     where_sql = ("WHERE " + " AND ".join(where_clauses)) if where_clauses else ""
 
diff --git a/frontend/src/routes/vorlagen/+page.svelte b/frontend/src/routes/vorlagen/+page.svelte
index 90a8aeb..6452a04 100644
--- a/frontend/src/routes/vorlagen/+page.svelte
+++ b/frontend/src/routes/vorlagen/+page.svelte
@@ -5,6 +5,12 @@
 	import { formatDate } from '$lib/status';
 
 	let data: Paginated<VorlageKurz> | null = $state(null);
+
+	function highlight(text: string | null, query: string): string {
+		if (!text || !query) return text || '-';
+		const escaped = query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+		return text.replace(new RegExp(`(${escaped})`, 'gi'), '<mark class="bg-yellow-200 rounded px-0.5">$1</mark>');
+	}
 	let error: string | null = $state(null);
 	let loading = $state(false);
 
@@ -71,7 +77,7 @@
 	<div class="flex flex-wrap gap-3 items-end">
 		<div>
 			<label for="suche" class="block text-xs font-medium text-gray-500 mb-1">Suche</label>
-			<input id="suche" type="text" bind:value={filterSuche} placeholder="Betreff oder Aktenzeichen..."
+			<input id="suche" type="text" bind:value={filterSuche} placeholder="Volltextsuche..."
 				class="border border-gray-300 rounded-lg px-3 py-2 text-sm focus:ring-2 focus:ring-green-500 focus:border-green-500"
 				onkeydown={(e) => { if (e.key === 'Enter') applyFilters(); }} />
 		</div>
@@ -117,10 +123,20 @@
 					<tr class="hover:bg-gray-50 transition-colors cursor-pointer" onclick={() => goto(`/vorlagen/${v.id}`)}>
 						<td class="px-4 py-3">
 							<a href="/vorlagen/{v.id}" class="font-mono text-sm font-medium text-green-700 hover:underline">
-								{v.aktenzeichen || `#${v.id}`}
+								{#if filterSuche}
+									{@html highlight(v.aktenzeichen || `#${v.id}`, filterSuche)}
+								{:else}
+									{v.aktenzeichen || `#${v.id}`}
+								{/if}
 							</a>
 						</td>
-						<td class="px-4 py-3 text-sm text-gray-700 max-w-lg truncate">{v.betreff || '-'}</td>
+						<td class="px-4 py-3 text-sm text-gray-700 max-w-lg truncate">
+							{#if filterSuche}
+								{@html highlight(v.betreff, filterSuche)}
+							{:else}
+								{v.betreff || '-'}
+							{/if}
+						</td>
 						<td class="px-4 py-3 text-sm text-gray-600 capitalize">{v.typ || '-'}</td>
 						<td class="px-4 py-3 text-sm text-gray-500">{formatDate(v.datum_eingang)}</td>
 					</tr>