diff --git a/src/lib/components/EntryCard.svelte b/src/lib/components/EntryCard.svelte
index c8f8a37..d001f6b 100644
--- a/src/lib/components/EntryCard.svelte
+++ b/src/lib/components/EntryCard.svelte
@@ -6,6 +6,7 @@
 	import ImageGallery from './ImageGallery.svelte';
 	import ImageUpload from './ImageUpload.svelte';
 	import TagInput from './TagInput.svelte';
+	import { highlightText } from '$lib/utils/highlightText';
 
 	interface EntryWithData extends Entry {
 		images: Image[];
@@ -15,9 +16,10 @@
 	interface Props {
 		entry: EntryWithData;
 		availableTags: Tag[];
+		searchQuery?: string;
 	}
 
-	let { entry, availableTags }: Props = $props();
+	let { entry, availableTags, searchQuery = '' }: Props = $props();
 
 	// Expand/collapse state
 	let expanded = $state(false);
@@ -300,7 +302,11 @@
 						? 'line-through text-gray-400'
 						: ''}"
 				>
-					{entry.title || 'Untitled'}
+					{#if !expanded && searchQuery}
+						{@html highlightText(entry.title || 'Untitled', searchQuery)}
+					{:else}
+						{entry.title || 'Untitled'}
+					{/if}
 				</h3>
 				{#if !expanded}
 					<p
@@ -308,7 +314,11 @@
 							? 'text-gray-400'
 							: ''}"
 					>
-						{entry.content}
+						{#if searchQuery}
+							{@html highlightText(entry.content, searchQuery)}
+						{:else}
+							{entry.content}
+						{/if}
 					</p>
 					{#if entry.tags?.length > 0}
 						<div class="flex flex-wrap gap-1 mt-1">
diff --git a/src/lib/utils/filterEntries.ts b/src/lib/utils/filterEntries.ts
index 067d99a..4bd1f77 100644
--- a/src/lib/utils/filterEntries.ts
+++ b/src/lib/utils/filterEntries.ts
@@ -7,15 +7,16 @@ interface EntryWithTags extends Entry {
 
 /**
  * Filters entries based on search criteria.
+ * Uses generics to preserve full entry type (including images, etc.)
  *
  * @param entries - Array of entries with their tags
  * @param filters - SearchFilters object containing filter criteria
  * @returns Filtered array of entries
  */
-export function filterEntries(
-	entries: EntryWithTags[],
+export function filterEntries<T extends EntryWithTags>(
+	entries: T[],
 	filters: SearchFilters
-): EntryWithTags[] {
+): T[] {
 	let result = entries;
 
 	// Text search (title + content) - minimum 2 characters
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 7ac77a6..2cdd0ae 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,14 +1,29 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import { page } from '$app/state';
+	import { get } from 'svelte/store';
 	import EntryList from '$lib/components/EntryList.svelte';
 	import QuickCapture from '$lib/components/QuickCapture.svelte';
 	import CompletedToggle from '$lib/components/CompletedToggle.svelte';
+	import SearchBar from '$lib/components/SearchBar.svelte';
+	import FilterBar from '$lib/components/FilterBar.svelte';
 	import { preferences } from '$lib/stores/preferences.svelte';
-	import { get } from 'svelte/store';
+	import { recentSearches, addRecentSearch } from '$lib/stores/recentSearches';
+	import { type SearchFilters, defaultFilters } from '$lib/types/search';
 
 	let { data } = $props();
 
+	// Search and filter state
+	let searchQuery = $state('');
+	let filters = $state<SearchFilters>({ ...defaultFilters });
+
+	// Sync filters.query with searchQuery
+	$effect(() => {
+		if (filters.query !== searchQuery) {
+			filters = { ...filters, query: searchQuery };
+		}
+	});
+
 	// Sync URL with preference on mount (client-side only)
 	$effect(() => {
 		if (typeof window !== 'undefined') {
@@ -27,6 +42,14 @@
 			}
 		}
 	});
+
+	function handleFilterChange(newFilters: SearchFilters) {
+		filters = newFilters;
+		// Sync query back to searchQuery
+		if (newFilters.query !== searchQuery) {
+			searchQuery = newFilters.query;
+		}
+	}
 </script>
 
 <svelte:head>
@@ -35,14 +58,21 @@
 
 <main class="min-h-screen bg-gray-50 pb-40">
 	<header class="bg-white border-b border-gray-200 sticky top-0 z-10">
-		<div class="max-w-2xl mx-auto px-4 py-4 flex items-center justify-between">
-			<h1 class="text-xl font-bold text-gray-900">TaskPlaner</h1>
-			<CompletedToggle />
+		<div class="max-w-2xl mx-auto px-4 py-4">
+			<div class="flex items-center justify-between mb-3">
+				<h1 class="text-xl font-bold text-gray-900">TaskPlaner</h1>
+				<CompletedToggle />
+			</div>
+			<SearchBar bind:value={searchQuery} recentSearches={$recentSearches} />
 		</div>
 	</header>
 
+	<div class="max-w-2xl mx-auto px-4 py-3">
+		<FilterBar {filters} availableTags={data.allTags} onchange={handleFilterChange} />
+	</div>
+
 	<div class="max-w-2xl mx-auto px-4 py-4">
-		<EntryList entries={data.entries} availableTags={data.allTags} />
+		<EntryList entries={data.entries} availableTags={data.allTags} {filters} {searchQuery} />
 	</div>
 
 	<QuickCapture />