diff --git a/src/lib/apis/tmdb/tmdbApi.ts b/src/lib/apis/tmdb/tmdbApi.ts
index 9e40bac..cf78bff 100644
--- a/src/lib/apis/tmdb/tmdbApi.ts
+++ b/src/lib/apis/tmdb/tmdbApi.ts
@@ -278,6 +278,15 @@ export const getTmdbMovieSimilar = (tmdbId: number) =>
 		}
 	}).then((res) => res.data?.results || []);
 
+export const searchTmdbTitles = (query: string) =>
+	TmdbApiOpen.get('/3/search/multi', {
+		params: {
+			query: {
+				query
+			}
+		}
+	}).then((res) => res.data?.results || []);
+
 // Deprecated hereon forward
 
 /** @deprecated */
diff --git a/src/lib/components/Navbar/TitleSearchModal.svelte b/src/lib/components/Navbar/TitleSearchModal.svelte
index c7189d5..6de3cf5 100644
--- a/src/lib/components/Navbar/TitleSearchModal.svelte
+++ b/src/lib/components/Navbar/TitleSearchModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import type { MultiSearchResponse } from '$lib/apis/tmdb/tmdbApi';
-	import { TmdbApi } from '$lib/apis/tmdb/tmdbApi';
+	import type { TmdbMovie2, TmdbSeries2 } from '$lib/apis/tmdb/tmdbApi';
+	import { searchTmdbTitles } from '$lib/apis/tmdb/tmdbApi';
 	import { TMDB_POSTER_SMALL } from '$lib/constants';
 	import { MagnifyingGlass } from 'radix-icons-svelte';
 	import { createModalProps } from '../Modal/Modal';
@@ -9,44 +9,64 @@
 	import ModalHeader from '../Modal/ModalHeader.svelte';
 
 	export let visible = false;
-	let searchInput: HTMLInputElement;
-	let searchValue = '';
+	let inputElement: HTMLInputElement;
+	let inputValue = '';
 
-	let timeout: NodeJS.Timeout;
 	let fetching = false;
-	let results: MultiSearchResponse['results'] | null = null;
+	let resultProps:
+		| {
+				tmdbId: number;
+				type: 'movie' | 'series';
+				overview: string;
+				posterUri: string;
+				title: string;
+				year: number;
+				seasons?: number;
+		  }[]
+		| undefined = undefined;
+
 	const modalProps = createModalProps(() => {
 		visible = false;
 	});
 
+	let searchTimeout: NodeJS.Timeout;
+
 	function clear() {
-		searchValue = '';
+		inputValue = '';
 		fetching = false;
-		results = null;
-		clearTimeout(timeout);
+		resultProps = undefined;
+		clearTimeout(searchTimeout);
 	}
 
-	const searchTimeout = () => {
-		clearTimeout(timeout);
-		timeout = setTimeout(() => {
-			searchMovie(searchValue);
+	const handleInput = () => {
+		clearTimeout(searchTimeout);
+		searchTimeout = setTimeout(() => {
+			searchMovie(inputValue);
 		}, 700);
 	};
 
 	const searchMovie = (query: string) => {
 		fetching = true;
-		TmdbApi.get<MultiSearchResponse>('/search/movie', {
-			params: {
-				query
-			}
-		})
-			.then((res) => {
-				if (res.data) results = res.data.results;
+		searchTmdbTitles(query)
+			.then((items) => {
+				resultProps = items
+					.filter((i) => i.media_type !== 'person')
+					.filter((i: TmdbMovie2 & TmdbSeries2) => i.release_date || i.first_air_date)
+					.map((i: TmdbMovie2 & TmdbSeries2) => ({
+						// Types not accurate!
+						tmdbId: i.id || 0,
+						type: (i as any).media_type === 'movie' ? 'movie' : 'series',
+						posterUri: i.poster_path || '',
+						title: i.title || i.name || '',
+						year: new Date(i.release_date || i.first_air_date || Date.now()).getFullYear(),
+						seasons: undefined,
+						overview: i.overview || ''
+					}));
 			})
 			.finally(() => (fetching = false));
 	};
 
-	$: if (visible && searchInput) searchInput.focus();
+	$: if (visible && inputElement) inputElement.focus();
 
 	function handleShortcuts(event: KeyboardEvent) {
 		if (event.key === 'k' && (event.metaKey || event.ctrlKey)) {
@@ -67,41 +87,48 @@
 			<ModalHeader {...modalProps}>
 				<MagnifyingGlass size={20} class="text-zinc-400" />
 				<input
-					bind:value={searchValue}
-					bind:this={searchInput}
-					on:input={searchTimeout}
+					bind:value={inputValue}
+					bind:this={inputElement}
+					on:input={handleInput}
 					type="text"
 					class="flex-1 bg-transparent font-light outline-none"
 					placeholder="Search for Movies and Shows..."
 				/>
 			</ModalHeader>
-			{#if !results || searchValue === ''}
+			{#if resultProps === undefined || inputValue === ''}
 				<div class="text-sm text-zinc-200 opacity-50 font-light p-4">No recent searches</div>
-			{:else if results?.length === 0 && !fetching}
+			{:else if resultProps?.length === 0 && !fetching}
 				<div class="text-sm text-zinc-200 opacity-50 font-light p-4">No search results</div>
 			{:else}
 				<div class="py-2">
-					{#each results.filter((m) => m).slice(0, 5) as result}
+					{#each resultProps.slice(0, 5) as result}
 						<!-- svelte-ignore a11y-click-events-have-key-events -->
 						<!-- svelte-ignore a11y-no-static-element-interactions -->
-						<div
-							class="flex px-4 py-2 gap-4 hover:bg-lighten cursor-pointer"
-							on:click={() => (window.location.href = '/movie/' + result.id)}
+						<a
+							class="flex px-4 py-2 gap-4 hover:bg-lighten focus-visible:bg-lighten cursor-pointer outline-none"
+							href={`/${result.type}/${result.tmdbId}`}
+							on:click={() => {
+								modalProps.close();
+								clear();
+							}}
 						>
 							<div
-								style={"background-image: url('" + TMDB_POSTER_SMALL + result.poster_path + "');"}
+								style={"background-image: url('" + TMDB_POSTER_SMALL + result.posterUri + "');"}
 								class="bg-center bg-cover w-16 h-24 rounded-sm"
 							/>
 							<div class="flex-1 flex flex-col gap-1">
 								<div class="flex gap-2">
-									<div class="font-normal tracking-wide">{result.original_title}</div>
+									<div class="font-normal tracking-wide">{result.title}</div>
 									<div class="text-zinc-400">
-										{new Date(result.release_date).getFullYear()}
+										{result.year}
 									</div>
+									{#if result.seasons}
+										<div class="text-zinc-400">{result.seasons}</div>
+									{/if}
 								</div>
 								<div class="text-sm text-zinc-300 line-clamp-3">{result.overview}</div>
 							</div>
-						</div>
+						</a>
 					{/each}
 				</div>
 			{/if}
diff --git a/src/routes/movie/[id]/MoviePage.svelte b/src/routes/movie/[id]/MoviePage.svelte
index 52daaf6..f3a2342 100644
--- a/src/routes/movie/[id]/MoviePage.svelte
+++ b/src/routes/movie/[id]/MoviePage.svelte
@@ -110,7 +110,10 @@
 			<div class="col-span-2 lg:col-span-1">
 				<p class="text-zinc-400 text-sm">Directed By</p>
 				<h2 class="font-medium">
-					{movie?.credits.crew?.filter((c) => c.job == 'Director').map((p) => p.name)}
+					{movie?.credits.crew
+						?.filter((c) => c.job == 'Director')
+						.map((p) => p.name)
+						.join(', ')}
 				</h2>
 			</div>
 			<div class="col-span-2 lg:col-span-1">