diff --git a/package.json b/package.json
index 3f3d1b5f..fc213632 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
 		"@sveltejs/kit": "^2.8.1",
 		"@sveltejs/vite-plugin-svelte": "^4.0.0",
 		"@types/eslint": "^9.6.1",
+		"@types/node": "^22.9.0",
 		"autoprefixer": "^10.4.20",
 		"eslint": "^9.14.0",
 		"eslint-config-prettier": "^9.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ef80f605..6a657168 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,25 +10,28 @@ importers:
     devDependencies:
       '@hearchco/sveltekit-adapter-aws':
         specifier: npm:@jsr/hearchco__sveltekit-adapter-aws@^0.1.12
-        version: '@jsr/hearchco__sveltekit-adapter-aws@0.1.12(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)'
+        version: '@jsr/hearchco__sveltekit-adapter-aws@0.1.12(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))'
       '@playwright/test':
         specifier: ^1.48.2
         version: 1.48.2
       '@sveltejs/adapter-auto':
         specifier: ^3.3.1
-        version: 3.3.1(@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11))
+        version: 3.3.1(@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))
       '@sveltejs/adapter-node':
         specifier: ^5.2.9
-        version: 5.2.9(@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11))
+        version: 5.2.9(@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))
       '@sveltejs/kit':
         specifier: ^2.8.1
-        version: 2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)
+        version: 2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))
       '@sveltejs/vite-plugin-svelte':
         specifier: ^4.0.0
-        version: 4.0.0(svelte@5.2.0)(vite@5.4.11)
+        version: 4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))
       '@types/eslint':
         specifier: ^9.6.1
         version: 9.6.1
+      '@types/node':
+        specifier: ^22.9.0
+        version: 22.9.0
       autoprefixer:
         specifier: ^10.4.20
         version: 10.4.20(postcss@8.4.49)
@@ -67,10 +70,10 @@ importers:
         version: 5.6.3
       vite:
         specifier: ^5.4.11
-        version: 5.4.11
+        version: 5.4.11(@types/node@22.9.0)
       vitest:
         specifier: ^2.1.5
-        version: 2.1.5
+        version: 2.1.5(@types/node@22.9.0)
 
 packages:
 
@@ -632,6 +635,9 @@ packages:
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
+  '@types/node@22.9.0':
+    resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==}
+
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
@@ -1587,6 +1593,9 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  undici-types@6.19.8:
+    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+
   update-browserslist-db@1.1.0:
     resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==}
     hasBin: true
@@ -1934,9 +1943,9 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  '@jsr/hearchco__sveltekit-adapter-aws@0.1.12(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)':
+  '@jsr/hearchco__sveltekit-adapter-aws@0.1.12(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))':
     dependencies:
-      '@sveltejs/kit': 2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)
+      '@sveltejs/kit': 2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))
       esbuild: 0.23.0
     transitivePeerDependencies:
       - '@sveltejs/vite-plugin-svelte'
@@ -2048,22 +2057,22 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.24.0':
     optional: true
 
-  '@sveltejs/adapter-auto@3.3.1(@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11))':
+  '@sveltejs/adapter-auto@3.3.1(@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))':
     dependencies:
-      '@sveltejs/kit': 2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)
+      '@sveltejs/kit': 2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))
       import-meta-resolve: 4.1.0
 
-  '@sveltejs/adapter-node@5.2.9(@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11))':
+  '@sveltejs/adapter-node@5.2.9(@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))':
     dependencies:
       '@rollup/plugin-commonjs': 28.0.1(rollup@4.24.0)
       '@rollup/plugin-json': 6.1.0(rollup@4.24.0)
       '@rollup/plugin-node-resolve': 15.3.0(rollup@4.24.0)
-      '@sveltejs/kit': 2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)
+      '@sveltejs/kit': 2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))
       rollup: 4.24.0
 
-  '@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)':
+  '@sveltejs/kit@2.8.1(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 4.0.0(svelte@5.2.0)(vite@5.4.11)
+      '@sveltejs/vite-plugin-svelte': 4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))
       '@types/cookie': 0.6.0
       cookie: 0.6.0
       devalue: 5.1.1
@@ -2077,27 +2086,27 @@ snapshots:
       sirv: 3.0.0
       svelte: 5.2.0
       tiny-glob: 0.2.9
-      vite: 5.4.11
+      vite: 5.4.11(@types/node@22.9.0)
 
-  '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.3(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)':
+  '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.3(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 4.0.0(svelte@5.2.0)(vite@5.4.11)
+      '@sveltejs/vite-plugin-svelte': 4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))
       debug: 4.3.7
       svelte: 5.2.0
-      vite: 5.4.11
+      vite: 5.4.11(@types/node@22.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11)':
+  '@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.3(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11))(svelte@5.2.0)(vite@5.4.11)
+      '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.3(@sveltejs/vite-plugin-svelte@4.0.0(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0)))(svelte@5.2.0)(vite@5.4.11(@types/node@22.9.0))
       debug: 4.3.7
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.12
       svelte: 5.2.0
-      vite: 5.4.11
-      vitefu: 1.0.3(vite@5.4.11)
+      vite: 5.4.11(@types/node@22.9.0)
+      vitefu: 1.0.3(vite@5.4.11(@types/node@22.9.0))
     transitivePeerDependencies:
       - supports-color
 
@@ -2114,6 +2123,10 @@ snapshots:
 
   '@types/json-schema@7.0.15': {}
 
+  '@types/node@22.9.0':
+    dependencies:
+      undici-types: 6.19.8
+
   '@types/resolve@1.20.2': {}
 
   '@vitest/expect@2.1.5':
@@ -2123,13 +2136,13 @@ snapshots:
       chai: 5.1.2
       tinyrainbow: 1.2.0
 
-  '@vitest/mocker@2.1.5(vite@5.4.11)':
+  '@vitest/mocker@2.1.5(vite@5.4.11(@types/node@22.9.0))':
     dependencies:
       '@vitest/spy': 2.1.5
       estree-walker: 3.0.3
       magic-string: 0.30.12
     optionalDependencies:
-      vite: 5.4.11
+      vite: 5.4.11(@types/node@22.9.0)
 
   '@vitest/pretty-format@2.1.5':
     dependencies:
@@ -3072,6 +3085,8 @@ snapshots:
 
   typescript@5.6.3: {}
 
+  undici-types@6.19.8: {}
+
   update-browserslist-db@1.1.0(browserslist@4.23.3):
     dependencies:
       browserslist: 4.23.3
@@ -3084,13 +3099,13 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
-  vite-node@2.1.5:
+  vite-node@2.1.5(@types/node@22.9.0):
     dependencies:
       cac: 6.7.14
       debug: 4.3.7
       es-module-lexer: 1.5.4
       pathe: 1.1.2
-      vite: 5.4.11
+      vite: 5.4.11(@types/node@22.9.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -3102,22 +3117,23 @@ snapshots:
       - supports-color
       - terser
 
-  vite@5.4.11:
+  vite@5.4.11(@types/node@22.9.0):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.4.49
       rollup: 4.24.0
     optionalDependencies:
+      '@types/node': 22.9.0
       fsevents: 2.3.3
 
-  vitefu@1.0.3(vite@5.4.11):
+  vitefu@1.0.3(vite@5.4.11(@types/node@22.9.0)):
     optionalDependencies:
-      vite: 5.4.11
+      vite: 5.4.11(@types/node@22.9.0)
 
-  vitest@2.1.5:
+  vitest@2.1.5(@types/node@22.9.0):
     dependencies:
       '@vitest/expect': 2.1.5
-      '@vitest/mocker': 2.1.5(vite@5.4.11)
+      '@vitest/mocker': 2.1.5(vite@5.4.11(@types/node@22.9.0))
       '@vitest/pretty-format': 2.1.5
       '@vitest/runner': 2.1.5
       '@vitest/snapshot': 2.1.5
@@ -3133,9 +3149,11 @@ snapshots:
       tinyexec: 0.3.1
       tinypool: 1.0.1
       tinyrainbow: 1.2.0
-      vite: 5.4.11
-      vite-node: 2.1.5
+      vite: 5.4.11(@types/node@22.9.0)
+      vite-node: 2.1.5(@types/node@22.9.0)
       why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 22.9.0
     transitivePeerDependencies:
       - less
       - lightningcss
diff --git a/src/lib/components/gadgets/timer/main.svelte b/src/lib/components/gadgets/timer/main.svelte
index 536c4eb4..4b065276 100644
--- a/src/lib/components/gadgets/timer/main.svelte
+++ b/src/lib/components/gadgets/timer/main.svelte
@@ -80,7 +80,7 @@
 		}
 	});
 
-	/** @type {number|undefined} */
+	/** @type {NodeJS.Timeout|undefined} */
 	let interval = $state(undefined);
 	function toggleState() {
 		if (beeping) {
diff --git a/src/lib/components/results/general/main.svelte b/src/lib/components/results/general/main.svelte
index 879c3488..81f1dbe1 100644
--- a/src/lib/components/results/general/main.svelte
+++ b/src/lib/components/results/general/main.svelte
@@ -9,7 +9,7 @@
 	 * @property {string} query
 	 * @property {string} category
 	 * @property {number} currentPage
-	 * @property {ResultType[]} results
+	 * @property {WebResultType[]} results
 	 */
 
 	/** @type {Props} */
diff --git a/src/lib/components/results/general/single.svelte b/src/lib/components/results/general/single.svelte
index 56e8dfd7..b627cd33 100644
--- a/src/lib/components/results/general/single.svelte
+++ b/src/lib/components/results/general/single.svelte
@@ -4,7 +4,7 @@
 
 	/**
 	 * @typedef {object} Props
-	 * @property {ResultType} result
+	 * @property {WebResultType} result
 	 */
 
 	/** @type {Props} */
diff --git a/src/lib/components/results/images/main.svelte b/src/lib/components/results/images/main.svelte
index 737bdb5a..a8a0fc93 100644
--- a/src/lib/components/results/images/main.svelte
+++ b/src/lib/components/results/images/main.svelte
@@ -10,8 +10,8 @@
 	 * @property {string} query
 	 * @property {string} category
 	 * @property {number} currentPage
-	 * @property {ResultType[]} results
-	 * @property {ResultType | undefined} imagePreview
+	 * @property {ImagesResultType[]} results
+	 * @property {ImagesResultType | undefined} imagePreview
 	 */
 
 	/** @type {Props} */
diff --git a/src/lib/components/results/images/preview.svelte b/src/lib/components/results/images/preview.svelte
index 9b18029f..b85354e4 100644
--- a/src/lib/components/results/images/preview.svelte
+++ b/src/lib/components/results/images/preview.svelte
@@ -3,8 +3,8 @@
 
 	/**
 	 * @typedef {object} Props
-	 * @property {ResultType} result
-	 * @property {ResultType | undefined} imagePreview
+	 * @property {ImagesResultType} result
+	 * @property {ImagesResultType | undefined} imagePreview
 	 */
 
 	/** @type {Props} */
diff --git a/src/lib/components/results/images/single.svelte b/src/lib/components/results/images/single.svelte
index 733d5b3d..a38c4d1a 100644
--- a/src/lib/components/results/images/single.svelte
+++ b/src/lib/components/results/images/single.svelte
@@ -3,8 +3,8 @@
 
 	/**
 	 * @typedef {object} Props
-	 * @property {ResultType} result
-	 * @property {ResultType | undefined} imagePreview
+	 * @property {ImagesResultType} result
+	 * @property {ImagesResultType | undefined} imagePreview
 	 */
 
 	/** @type {Props} */
diff --git a/src/lib/components/results/infiniteloading/main.svelte b/src/lib/components/results/infiniteloading/main.svelte
index dd0c39a5..eff9dace 100644
--- a/src/lib/components/results/infiniteloading/main.svelte
+++ b/src/lib/components/results/infiniteloading/main.svelte
@@ -1,14 +1,19 @@
 <script>
 	import { concatSearchParams } from '$lib/functions/api/concatparams';
-	import { fetchAdditionalResults } from '$lib/functions/api/additionalresults';
-	import { fetchResults } from '$lib/functions/api/fetchapi';
+	import {
+		fetchAdditionalWebResults,
+		fetchAdditionalImagesResults
+	} from '$lib/functions/api/additionalresults';
+	import { fetchWebResults, fetchImagesResults } from '$lib/functions/api/fetchapi';
+	import { assertImagesResultType } from '$lib/types/search/assert';
+	import { getCategoryConfigBase64 } from '$lib/functions/categories/convert';
 
 	/**
 	 * @typedef {object} Props
 	 * @property {string} query
 	 * @property {string} category
 	 * @property {number} currentPage
-	 * @property {ResultType[]} results
+	 * @property {WebResultType[] | ImagesResultType[]} results
 	 */
 
 	/** @type {Props} */
@@ -20,10 +25,12 @@
 		event.preventDefault();
 		const params = concatSearchParams([
 			['q', query],
-			['category', category],
+			['category', getCategoryConfigBase64(category)],
 			['start', nextPage.toString()]
 		]);
-		const newResults = await fetchAdditionalResults(results, params);
+		const newResults = assertImagesResultType(results, category)
+			? await fetchAdditionalImagesResults(results, params)
+			: await fetchAdditionalWebResults(results, params);
 		results = newResults;
 		nextPage = nextPage + 1;
 	}
@@ -31,10 +38,15 @@
 	async function preloadResults() {
 		const params = concatSearchParams([
 			['q', query],
-			['category', category],
+			['category', getCategoryConfigBase64(category)],
 			['start', nextPage.toString()]
 		]);
-		await fetchResults(params);
+
+		if (assertImagesResultType(results, category)) {
+			await fetchImagesResults(params);
+		} else {
+			await fetchWebResults(params);
+		}
 	}
 </script>
 
diff --git a/src/lib/components/searchbox/main.svelte b/src/lib/components/searchbox/main.svelte
index 6cf1b1e9..3ed72466 100644
--- a/src/lib/components/searchbox/main.svelte
+++ b/src/lib/components/searchbox/main.svelte
@@ -1,7 +1,7 @@
 <script>
-	import { CategoryEnum } from '$lib/types/search/category';
+	import { CategoryEnum } from '$lib/types/search/categoryenum';
 	import { getQueryWithoutCategory } from '$lib/functions/query/category';
-	import { fetchSuggestions } from '$lib/functions/api/fetchapi';
+	import { fetchSuggestionsResults } from '$lib/functions/api/fetchapi';
 
 	/**
 	 * @typedef {object} Props
@@ -36,7 +36,7 @@
 	// Whether to show suggestions or not.
 	let shouldShowSuggs = $state(homepage);
 
-	/** @type {SuggestionType[]} */
+	/** @type {SuggestionsResultType[]} */
 	let suggestions = $state([]);
 
 	// Determines if the suggestions can be shown.
@@ -47,7 +47,7 @@
 		if (getQueryWithoutCategory(currQuery) === '') {
 			suggestions = [];
 		} else if (currentIndex === -1) {
-			fetchSuggestions(getQueryWithoutCategory(currQuery)).then((resp) => {
+			fetchSuggestionsResults(getQueryWithoutCategory(currQuery)).then((resp) => {
 				const maxSize = 10;
 				if (resp.suggestions.length > maxSize)
 					resp.suggestions.splice(maxSize, resp.suggestions.length - maxSize);
diff --git a/src/lib/functions/api/additionalresults.js b/src/lib/functions/api/additionalresults.js
index 7cfb18db..999366ae 100644
--- a/src/lib/functions/api/additionalresults.js
+++ b/src/lib/functions/api/additionalresults.js
@@ -1,13 +1,47 @@
-import { fetchResults } from './fetchapi';
+import { fetchWebResults, fetchImagesResults } from './fetchapi';
 
 /**
  * Fetches additional results from the API and combines with the old results.
- * @param {ResultType[]} oldResults
+ * @param {WebResultType[]} oldResults
  * @param {URLSearchParams} params
- * @returns {Promise<ResultType[]>}
+ * @returns {Promise<WebResultType[]>}
  */
-export async function fetchAdditionalResults(oldResults, params) {
-	const resp = await fetchResults(params);
+export async function fetchAdditionalWebResults(oldResults, params) {
+	const resp = await fetchWebResults(params);
+	const newResults = resp.results;
+
+	// Get the last rank from old results.
+	const lastRank = oldResults[oldResults.length - 1].rank;
+
+	// Make the new results start from the last rank of the old results.
+	for (const result of newResults) {
+		result.rank += lastRank;
+	}
+
+	// Combine the old results with the new results (removing duplicates).
+	const combinedResults = oldResults.concat(
+		newResults.filter(
+			(newResult) => !oldResults.some((oldResult) => oldResult.url === newResult.url)
+		)
+	);
+
+	// Make all ranks consecutive.
+	// Starting from the appended results, because the old results already have consecutive ranks.
+	for (let i = lastRank; i < combinedResults.length; i++) {
+		combinedResults[i].rank = i + 1;
+	}
+
+	return combinedResults;
+}
+
+/**
+ * Fetches additional results from the API and combines with the old results.
+ * @param {ImagesResultType[]} oldResults
+ * @param {URLSearchParams} params
+ * @returns {Promise<ImagesResultType[]>}
+ */
+export async function fetchAdditionalImagesResults(oldResults, params) {
+	const resp = await fetchImagesResults(params);
 	const newResults = resp.results;
 
 	// Get the last rank from old results.
diff --git a/src/lib/functions/api/createurl.js b/src/lib/functions/api/createurl.js
index f64458ef..9262661c 100644
--- a/src/lib/functions/api/createurl.js
+++ b/src/lib/functions/api/createurl.js
@@ -7,7 +7,7 @@ import { error } from '@sveltejs/kit';
  * @param {URLSearchParams} [params]
  * @returns {URL}
  */
-export function createApiUrl(path = '', params = new URLSearchParams()) {
+export function createApiUrl(path = '/', params = new URLSearchParams()) {
 	const apiUri = env.PUBLIC_API_URI;
 	if (!apiUri) {
 		// Internal Server Error.
diff --git a/src/lib/functions/api/fetchapi.js b/src/lib/functions/api/fetchapi.js
index 44aafe01..d9fc32be 100644
--- a/src/lib/functions/api/fetchapi.js
+++ b/src/lib/functions/api/fetchapi.js
@@ -1,3 +1,4 @@
+import { getSuggestionsCategoryConfigBase64 } from '../categories/convert';
 import { concatSearchParams } from './concatparams';
 import { fetchAPI } from './fetchapigeneric';
 
@@ -7,41 +8,52 @@ import { fetchAPI } from './fetchapigeneric';
  * @returns {Promise<CurrenciesResponseType>}
  */
 export async function fetchCurrencies(fetcher = fetch) {
-	return await fetchAPI(fetcher, 'currencies');
+	return await fetchAPI(fetcher, '/exchange/currencies');
 }
 
+// /**
+//  * Fetches /exchange with params from the API.
+//  * @param {URLSearchParams} params
+//  * @param {typeof fetch} [fetcher]
+//  * @returns {Promise<ExchangeResponseType>}
+//  */
+// export async function fetchExchange(params, fetcher = fetch) {
+// 	return await fetchAPI(fetcher, '/exchange', params);
+// }
+
 /**
- * Fetches /exchange with params from the API.
+ * Fetches /search/web with params from the API.
  * @param {URLSearchParams} params
  * @param {typeof fetch} [fetcher]
- * @returns {Promise<ExchangeResponseType>}
+ * @returns {Promise<WebResultsResponseType>}
  */
-export async function fetchExchange(params, fetcher = fetch) {
-	return await fetchAPI(fetcher, 'exchange', params);
+export async function fetchWebResults(params, fetcher = fetch) {
+	return await fetchAPI(fetcher, '/search/web', params);
 }
 
 /**
- * Fetches /search with params from the API.
+ * Fetches /search/images with params from the API.
  * @param {URLSearchParams} params
  * @param {typeof fetch} [fetcher]
- * @returns {Promise<ResultsResponseType>}
+ * @returns {Promise<ImagesResultsResponseType>}
  */
-export async function fetchResults(params, fetcher = fetch) {
-	return await fetchAPI(fetcher, 'search', params);
+export async function fetchImagesResults(params, fetcher = fetch) {
+	return await fetchAPI(fetcher, '/search/images', params);
 }
 
 /**
- * Fetches /suggestions with query from the API.
+ * Fetches /search/suggestions with query from the API.
  * @param {string} query
  * @param {typeof fetch} [fetcher]
- * @returns {Promise<SuggestionsResponseType>}
+ * @returns {Promise<SuggestionsResultsResponseType>}
  */
-export async function fetchSuggestions(query, fetcher = fetch) {
+export async function fetchSuggestionsResults(query, fetcher = fetch) {
 	/** @type {URLSearchParams} */
 	const params = concatSearchParams([
 		['q', query],
-		['output', 'json']
+		['output', 'json'],
+		['category', getSuggestionsCategoryConfigBase64()]
 	]);
 
-	return await fetchAPI(fetcher, 'suggestions', params);
+	return await fetchAPI(fetcher, '/search/suggestions', params);
 }
diff --git a/src/lib/functions/api/fetchapiversion.js b/src/lib/functions/api/fetchapiversion.js
index 1a5302e3..f8c53ea4 100644
--- a/src/lib/functions/api/fetchapiversion.js
+++ b/src/lib/functions/api/fetchapiversion.js
@@ -10,7 +10,7 @@ export async function fetchVersion(fetcher = fetch) {
 	/** @type {URL} */
 	let apiUrl;
 	try {
-		apiUrl = createApiUrl('versionz');
+		apiUrl = createApiUrl('/versionz');
 	} catch (err) {
 		// Internal Server Error.
 		throw error(500, `Failed to create API URL: ${err}`);
diff --git a/src/lib/functions/api/proxyimage.js b/src/lib/functions/api/proxyimage.js
index 45a25daa..0ba967b7 100644
--- a/src/lib/functions/api/proxyimage.js
+++ b/src/lib/functions/api/proxyimage.js
@@ -19,7 +19,7 @@ export function proxyImageLink(url, hash, timestamp) {
 	/** @type {URL} */
 	let apiUrl;
 	try {
-		apiUrl = createApiUrl('proxy', params);
+		apiUrl = createApiUrl('/imageproxy', params);
 	} catch (err) {
 		// Internal Server Error.
 		throw error(500, `Failed to create API URL: ${err}`);
@@ -45,7 +45,7 @@ export function proxyFaviconLink(fqdn, hash, timestamp) {
 	/** @type {URL} */
 	let apiUrl;
 	try {
-		apiUrl = createApiUrl('proxy', params);
+		apiUrl = createApiUrl('/imageproxy', params);
 	} catch (err) {
 		// Internal Server Error.
 		throw error(500, `Failed to create API URL: ${err}`);
diff --git a/src/lib/functions/categories/convert.js b/src/lib/functions/categories/convert.js
new file mode 100644
index 00000000..a09d7041
--- /dev/null
+++ b/src/lib/functions/categories/convert.js
@@ -0,0 +1,35 @@
+import { CategoryEnum } from '$lib/types/search/categoryenum';
+import { objectToBase64 } from '../encoding/base64';
+import { imagesCategory } from './images';
+import { scienceCategory } from './science';
+import { suggestionsCategory } from './suggestions';
+import { thoroughCategory } from './thorough';
+import { webCategory } from './web';
+
+/**
+ * Returns the category config in Base64 format.
+ * @param {CategoryEnum} category - The category string to map.
+ * @returns {string} The category config.
+ */
+export function getCategoryConfigBase64(category) {
+	switch (category) {
+		case CategoryEnum.GENERAL:
+			return objectToBase64(webCategory);
+		case CategoryEnum.IMAGES:
+			return objectToBase64(imagesCategory);
+		case CategoryEnum.SCIENCE:
+			return objectToBase64(scienceCategory);
+		case CategoryEnum.THOROUGH:
+			return objectToBase64(thoroughCategory);
+		default:
+			throw new Error(`Invalid category: ${category}`);
+	}
+}
+
+/**
+ * Return the suggestions category config in Base64 format.
+ * @returns {string} The suggestions category config.
+ */
+export function getSuggestionsCategoryConfigBase64() {
+	return objectToBase64(suggestionsCategory);
+}
diff --git a/src/lib/functions/categories/images.js b/src/lib/functions/categories/images.js
new file mode 100644
index 00000000..fcd47c21
--- /dev/null
+++ b/src/lib/functions/categories/images.js
@@ -0,0 +1,47 @@
+/**
+ * Images category config.
+ * @type {CategoryType}
+ */
+export const imagesCategory = {
+	engines: {
+		bing: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: true,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		google: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: true,
+			preferred: false,
+			preferredbyorigin: false
+		}
+	},
+	ranking: {
+		rankexp: 0.5,
+		rankmul: 1,
+		rankconst: 0,
+		rankscoremul: 1,
+		rankscoreadd: 0,
+		timesreturnedmul: 1,
+		timesreturnedadd: 0,
+		timesreturnedscoremul: 1,
+		timesreturnedscoreadd: 0,
+		engines: {
+			bing: {
+				mul: 1,
+				add: 0
+			},
+			google: {
+				mul: 1,
+				add: 0
+			}
+		}
+	},
+	timings: {
+		preferredtimeout: '500',
+		hardtimeout: '1500'
+	}
+};
diff --git a/src/lib/functions/categories/science.js b/src/lib/functions/categories/science.js
new file mode 100644
index 00000000..7cd4693e
--- /dev/null
+++ b/src/lib/functions/categories/science.js
@@ -0,0 +1,36 @@
+/**
+ * Science category config.
+ * @type {CategoryType}
+ */
+export const scienceCategory = {
+	engines: {
+		googlescholar: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: true,
+			preferred: false,
+			preferredbyorigin: false
+		}
+	},
+	ranking: {
+		rankexp: 0.5,
+		rankmul: 1,
+		rankconst: 0,
+		rankscoremul: 1,
+		rankscoreadd: 0,
+		timesreturnedmul: 1,
+		timesreturnedadd: 0,
+		timesreturnedscoremul: 1,
+		timesreturnedscoreadd: 0,
+		engines: {
+			googlescholar: {
+				mul: 1,
+				add: 0
+			}
+		}
+	},
+	timings: {
+		preferredtimeout: '500',
+		hardtimeout: '1500'
+	}
+};
diff --git a/src/lib/functions/categories/suggestions.js b/src/lib/functions/categories/suggestions.js
new file mode 100644
index 00000000..b455303a
--- /dev/null
+++ b/src/lib/functions/categories/suggestions.js
@@ -0,0 +1,47 @@
+/**
+ * Suggestions category config.
+ * @type {CategoryType}
+ */
+export const suggestionsCategory = {
+	engines: {
+		duckduckgo: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: true,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		google: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: true,
+			preferred: false,
+			preferredbyorigin: false
+		}
+	},
+	ranking: {
+		rankexp: 0.5,
+		rankmul: 1,
+		rankconst: 0,
+		rankscoremul: 1,
+		rankscoreadd: 0,
+		timesreturnedmul: 1,
+		timesreturnedadd: 0,
+		timesreturnedscoremul: 1,
+		timesreturnedscoreadd: 0,
+		engines: {
+			duckduckgo: {
+				mul: 1,
+				add: 0
+			},
+			google: {
+				mul: 1,
+				add: 0
+			}
+		}
+	},
+	timings: {
+		preferredtimeout: '300',
+		hardtimeout: '500'
+	}
+};
diff --git a/src/lib/functions/categories/thorough.js b/src/lib/functions/categories/thorough.js
new file mode 100644
index 00000000..84b90053
--- /dev/null
+++ b/src/lib/functions/categories/thorough.js
@@ -0,0 +1,159 @@
+/**
+ * Thorough category config.
+ * @type {CategoryType}
+ */
+export const thoroughCategory = {
+	engines: {
+		bing: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		brave: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		duckduckgo: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		etools: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		google: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		mojeek: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		presearch: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		qwant: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		startpage: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		swisscows: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		yahoo: {
+			enabled: true,
+			required: true,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		}
+		// WARN: Disabled currently
+		// yep: {
+		// 	enabled: true,
+		// 	required: true,
+		// 	requiredbyorigin: false,
+		// 	preferred: false,
+		// 	preferredbyorigin: false
+		// }
+	},
+	ranking: {
+		rankexp: 0.5,
+		rankmul: 1,
+		rankconst: 0,
+		rankscoremul: 1,
+		rankscoreadd: 0,
+		timesreturnedmul: 1,
+		timesreturnedadd: 0,
+		timesreturnedscoremul: 1,
+		timesreturnedscoreadd: 0,
+		engines: {
+			bing: {
+				mul: 1,
+				add: 0
+			},
+			brave: {
+				mul: 1,
+				add: 0
+			},
+			duckduckgo: {
+				mul: 1,
+				add: 0
+			},
+			etools: {
+				mul: 1,
+				add: 0
+			},
+			google: {
+				mul: 1,
+				add: 0
+			},
+			mojeek: {
+				mul: 1,
+				add: 0
+			},
+			presearch: {
+				mul: 1,
+				add: 0
+			},
+			qwant: {
+				mul: 1,
+				add: 0
+			},
+			startpage: {
+				mul: 1,
+				add: 0
+			},
+			swisscows: {
+				mul: 1,
+				add: 0
+			},
+			yahoo: {
+				mul: 1,
+				add: 0
+			}
+			// WARN: Disabled currently
+			// yep: {
+			//     mul: 1,
+			//     add: 0
+			// }
+		}
+	},
+	timings: {
+		preferredtimeout: '3000',
+		hardtimeout: '5000'
+	}
+};
diff --git a/src/lib/functions/categories/web.js b/src/lib/functions/categories/web.js
new file mode 100644
index 00000000..3775b9cd
--- /dev/null
+++ b/src/lib/functions/categories/web.js
@@ -0,0 +1,159 @@
+/**
+ * Web category config.
+ * @type {CategoryType}
+ */
+export const webCategory = {
+	engines: {
+		bing: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: true,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		brave: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: true,
+			preferredbyorigin: false
+		},
+		duckduckgo: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		etools: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		google: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: true,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		mojeek: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: true,
+			preferredbyorigin: false
+		},
+		presearch: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		qwant: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		startpage: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		swisscows: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		},
+		yahoo: {
+			enabled: true,
+			required: false,
+			requiredbyorigin: false,
+			preferred: false,
+			preferredbyorigin: false
+		}
+		// WARN: Disabled currently
+		// yep: {
+		// 	enabled: true,
+		// 	required: false,
+		// 	requiredbyorigin: false,
+		// 	preferred: true,
+		// 	preferredbyorigin: false
+		// }
+	},
+	ranking: {
+		rankexp: 0.5,
+		rankmul: 1,
+		rankconst: 0,
+		rankscoremul: 1,
+		rankscoreadd: 0,
+		timesreturnedmul: 1,
+		timesreturnedadd: 0,
+		timesreturnedscoremul: 1,
+		timesreturnedscoreadd: 0,
+		engines: {
+			bing: {
+				mul: 1,
+				add: 0
+			},
+			brave: {
+				mul: 1,
+				add: 0
+			},
+			duckduckgo: {
+				mul: 1,
+				add: 0
+			},
+			etools: {
+				mul: 1,
+				add: 0
+			},
+			google: {
+				mul: 1,
+				add: 0
+			},
+			mojeek: {
+				mul: 1,
+				add: 0
+			},
+			presearch: {
+				mul: 1,
+				add: 0
+			},
+			qwant: {
+				mul: 1,
+				add: 0
+			},
+			startpage: {
+				mul: 1,
+				add: 0
+			},
+			swisscows: {
+				mul: 1,
+				add: 0
+			},
+			yahoo: {
+				mul: 1,
+				add: 0
+			}
+			// WARN: Disabled currently
+			// yep: {
+			//     mul: 1,
+			//     add: 0
+			// }
+		}
+	},
+	timings: {
+		preferredtimeout: '500',
+		hardtimeout: '1500'
+	}
+};
diff --git a/src/lib/functions/encoding/base64.js b/src/lib/functions/encoding/base64.js
new file mode 100644
index 00000000..20584eab
--- /dev/null
+++ b/src/lib/functions/encoding/base64.js
@@ -0,0 +1,15 @@
+/**
+ * Convert any object to it's JSON.stringify() representation and then Base64 encode it.
+ * @param {object} obj - The object to encode.
+ * @returns {string} The Base64 encoded object.
+ */
+export function objectToBase64(obj) {
+	// Detect whether running in Node.js or browser
+	if (typeof window === 'undefined') {
+		// Node.js
+		return Buffer.from(JSON.stringify(obj)).toString('base64');
+	} else {
+		// Browser
+		return btoa(JSON.stringify(obj));
+	}
+}
diff --git a/src/lib/types/search/assert.js b/src/lib/types/search/assert.js
new file mode 100644
index 00000000..537cc87e
--- /dev/null
+++ b/src/lib/types/search/assert.js
@@ -0,0 +1,11 @@
+import { CategoryEnum } from './categoryenum';
+
+/**
+ * Asserts that the given results are images result type using the category.
+ * @param {WebResultType[] | ImagesResultType[]} results
+ * @param {CategoryEnum} category
+ * @returns {results is ImagesResultType[]}
+ */
+export function assertImagesResultType(results, category) {
+	return category === CategoryEnum.IMAGES;
+}
diff --git a/src/lib/types/search/category.js b/src/lib/types/search/category.js
index 39c2e413..3245940a 100644
--- a/src/lib/types/search/category.js
+++ b/src/lib/types/search/category.js
@@ -1,52 +1,46 @@
 /**
- * Enum for category types.
- * @enum {string}
- * @readonly
+ * Describes the overall configuration for one category including search engines, ranking, and timings.
+ * @typedef {Object} CategoryType
+ * @property {Object.<string, EngineJSON>} engines - Configuration for each search engine by name.
+ * @property {RankingJSON} ranking - Configuration for ranking parameters.
+ * @property {TimingsJSON} timings - Configuration for operation timings.
  */
-export const CategoryEnum = {
-	GENERAL: 'general',
-	IMAGES: 'images',
-	SCIENCE: 'science',
-	THOROUGH: 'thorough'
-};
 
 /**
- * Converts a string to a category type if possible.
- * @param {string} category - The category to convert.
- * @returns {CategoryEnum | undefined} The category type.
+ * Describes the configuration for individual search engines.
+ * @typedef {Object} EngineJSON
+ * @property {boolean} enabled - If false, the engine will not be used and other options will be ignored.
+ * @property {boolean} required - If true, the engine will be awaited unless the hard timeout is reached.
+ * @property {boolean} requiredbyorigin - If true, the fastest engine with this engine in "Origins" will be awaited unless the hard timeout is reached.
+ * @property {boolean} preferred - If true, the engine will be awaited unless the preferred timeout is reached.
+ * @property {boolean} preferredbyorigin - If true, the fastest engine with this engine in "Origins" will be awaited unless the preferred timeout is reached.
  */
-export function toCategoryType(category) {
-	switch (category) {
-		case 'general':
-		case 'normal':
-			return CategoryEnum.GENERAL;
-		case 'images':
-		case 'image':
-		case 'imgs':
-		case 'img':
-			return CategoryEnum.IMAGES;
-		case 'science':
-		case 'sci':
-			return CategoryEnum.SCIENCE;
-		case 'thorough':
-		case 'detailed':
-		case 'slow':
-			return CategoryEnum.THOROUGH;
-		default:
-			return undefined;
-	}
-}
 
 /**
- * Returns the category to be used for UI display.
- * @param {CategoryEnum} category - The category to convert.
- * @returns {CategoryEnum} The category to display.
+ * Describes the ranking configuration parameters.
+ * @typedef {Object} RankingJSON
+ * @property {number} rankexp - The exponent used on the rank itself.
+ * @property {number} rankmul - Multiplier for the rank itself.
+ * @property {number} rankconst - Addition to the rank itself.
+ * @property {number} rankscoremul - Multiplier for the rank score (calculated as 100 / rank + other variables applied).
+ * @property {number} rankscoreadd - Addition to the rank score.
+ * @property {number} timesreturnedmul - Multiplier for the number of times the result was returned.
+ * @property {number} timesreturnedadd - Addition to the number of times the result was returned.
+ * @property {number} timesreturnedscoremul - Multiplier for the times returned score (calculated as log(timesReturnedNum + other variables applied)).
+ * @property {number} timesreturnedscoreadd - Addition to the times returned score.
+ * @property {Object.<string, EngineRankingJSON>} engines - Multipliers and additions for each engine, applied to the rank score.
+ */
+
+/**
+ * Describes the ranking multipliers and additions for a specific engine.
+ * @typedef {Object} EngineRankingJSON
+ * @property {number} mul - Multiplier for the engine ranking.
+ * @property {number} add - Addition to the engine ranking.
+ */
+
+/**
+ * Describes the timing configuration for operations.
+ * @typedef {Object} TimingsJSON
+ * @property {string} preferredtimeout - Maximum amount of time to wait for the preferred engines (or by origin) to respond. If waiting for required engines (or by origin) after this time, the search continues.
+ * @property {string} hardtimeout - Hard timeout after which the search is forcefully stopped, even if the engines didn't respond.
  */
-export function toDisplayCategory(category) {
-	switch (category) {
-		case CategoryEnum.IMAGES:
-			return CategoryEnum.IMAGES;
-		default:
-			return CategoryEnum.GENERAL;
-	}
-}
diff --git a/src/lib/types/search/categoryenum.js b/src/lib/types/search/categoryenum.js
new file mode 100644
index 00000000..934f0cdf
--- /dev/null
+++ b/src/lib/types/search/categoryenum.js
@@ -0,0 +1,39 @@
+/**
+ * Enum for category types.
+ * @enum {string}
+ * @readonly
+ */
+export const CategoryEnum = {
+	GENERAL: 'general',
+	IMAGES: 'images',
+	SCIENCE: 'science',
+	THOROUGH: 'thorough'
+};
+
+/**
+ * Converts a string to a category type if possible.
+ * @param {string} category - The category to convert.
+ * @returns {CategoryEnum | undefined} The category type.
+ */
+export function toCategoryEnumType(category) {
+	switch (category) {
+		case 'general':
+		case 'normal':
+			return CategoryEnum.GENERAL;
+		case 'images':
+		case 'image':
+		case 'imgs':
+		case 'img':
+		case 'i':
+			return CategoryEnum.IMAGES;
+		case 'science':
+		case 'sci':
+			return CategoryEnum.SCIENCE;
+		case 'thorough':
+		case 'detailed':
+		case 'slow':
+			return CategoryEnum.THOROUGH;
+		default:
+			return undefined;
+	}
+}
diff --git a/src/lib/types/search/response.js b/src/lib/types/search/response.js
index ab6f3b0d..ed3af305 100644
--- a/src/lib/types/search/response.js
+++ b/src/lib/types/search/response.js
@@ -7,17 +7,25 @@
 
 /**
  * Defines the structure for results responses.
- * @typedef {Object} ResultsResponseType
+ * @typedef {Object} WebResultsResponseType
  * @property {string} version - The version of the API.
  * @property {number} duration - The duration of the search in milliseconds.
- * @property {ResultType[]} results - The search results.
+ * @property {WebResultType[]} results - The search results.
  */
 
 /**
- * @typedef {Object} SuggestionsResponseType
+ * Defines the structure for results responses.
+ * @typedef {Object} ImagesResultsResponseType
+ * @property {string} version - The version of the API.
+ * @property {number} duration - The duration of the search in milliseconds.
+ * @property {ImagesResultType[]} results - The search results.
+ */
+
+/**
+ * @typedef {Object} SuggestionsResultsResponseType
  * @property {string} version - The version of the API.
  * @property {number} duration - The duration of the search in milliseconds.
- * @property {SuggestionType[]} suggestions - The suggestions.
+ * @property {SuggestionsResultType[]} suggestions - The suggestions.
  */
 
 /**
diff --git a/src/lib/types/search/result.js b/src/lib/types/search/result.js
index c0b43dad..9ede761e 100644
--- a/src/lib/types/search/result.js
+++ b/src/lib/types/search/result.js
@@ -1,6 +1,22 @@
 /**
- * Describes the properties of a search result.
- * @typedef {Object} ResultType
+ * Describes the properties of a web search result.
+ * @typedef {Object} WebResultType
+ * @property {string} url - URL of the result.
+ * @property {string} url_hash - Hash of the URL (used only for images).
+ * @property {string} url_hash_timestamp - Timestamp of the URL hash (used only for images).
+ * @property {string} fqdn - The fully qualified domain name of the result.
+ * @property {string} fqdn_hash - Hash required for proxying the favicon.
+ * @property {string} fqdn_hash_timestamp - Timestamp of the favicon hash.
+ * @property {number} rank - The rank of the result.
+ * @property {number} score - The score of the result.
+ * @property {string} title - The title of the result.
+ * @property {string} description - The description of the result.
+ * @property {EngineRankType[]} engine_ranks - Rankings on different search engines.
+ */
+
+/**
+ * Describes the properties of a images search result.
+ * @typedef {Object} ImagesResultType
  * @property {string} url - URL of the result.
  * @property {string} url_hash - Hash of the URL (used only for images).
  * @property {string} url_hash_timestamp - Timestamp of the URL hash (used only for images).
@@ -12,7 +28,6 @@
  * @property {string} title - The title of the result.
  * @property {string} description - The description of the result.
  * @property {EngineRankType[]} engine_ranks - Rankings on different search engines.
- * ImageResultType
  * @property {ImageFormatType} original - The original image format details.
  * @property {ImageFormatType} thumbnail - The thumbnail image format details.
  * @property {string} thumbnail_url - URL to the thumbnail image.
@@ -22,6 +37,15 @@
  * @property {string} source_url - URL of the image source.
  */
 
+/**
+ * Describes the properties of a suggestion result.
+ * @typedef {Object} SuggestionsResultType
+ * @property {string} value - Value of the suggestion.
+ * @property {number} rank - The rank of the suggestion.
+ * @property {number} score - The score of the suggestion.
+ * @property {EngineRankSimpleType[]} engine_ranks - Rankings on different search engines.
+ */
+
 /**
  * Represents the ranking of a result on a specific search engine.
  * @typedef {Object} EngineRankType
@@ -31,6 +55,13 @@
  * @property {number} on_page_rank - The rank of the result on the specific page.
  */
 
+/**
+ * Represents the ranking of a result on a specific search engine.
+ * @typedef {Object} EngineRankSimpleType
+ * @property {string} search_engine - The name of the search engine.
+ * @property {number} rank - The overall rank of the result.
+ */
+
 /**
  * Defines the format of an image.
  * @typedef {Object} ImageFormatType
diff --git a/src/lib/types/search/suggestion.js b/src/lib/types/search/suggestion.js
deleted file mode 100644
index 1757dd93..00000000
--- a/src/lib/types/search/suggestion.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Describes the properties of a suggestion result.
- * @typedef {Object} SuggestionType
- * @property {string} value - Value of the suggestion.
- * @property {number} rank - The rank of the suggestion.
- * @property {number} score - The score of the suggestion.
- * @property {EngineRankSimpleType[]} engine_ranks - Rankings on different search engines.
- */
-
-/**
- * Represents the ranking of a result on a specific search engine.
- * @typedef {Object} EngineRankSimpleType
- * @property {string} search_engine - The name of the search engine.
- * @property {number} rank - The overall rank of the result.
- */
diff --git a/src/routes/opensearch.xml/+server.js b/src/routes/opensearch.xml/+server.js
index 0a2325ba..ad07cca4 100644
--- a/src/routes/opensearch.xml/+server.js
+++ b/src/routes/opensearch.xml/+server.js
@@ -111,5 +111,5 @@ function getFaviconUrl() {
 
 /** @returns {string} */
 function getSuggestionsUrl() {
-	return createApiUrl('suggestions').toString();
+	return createApiUrl('/search/suggestions').toString();
 }
diff --git a/src/routes/search/+page.js b/src/routes/search/+page.js
index c796cc4b..b3cd94c8 100644
--- a/src/routes/search/+page.js
+++ b/src/routes/search/+page.js
@@ -3,9 +3,10 @@ import { error } from '@sveltejs/kit';
 
 import { getCategoryFromQuery, getQueryWithoutCategory } from '$lib/functions/query/category';
 import { concatSearchParams } from '$lib/functions/api/concatparams';
-import { fetchResults, fetchCurrencies } from '$lib/functions/api/fetchapi';
-import { CategoryEnum, toCategoryType } from '$lib/types/search/category';
+import { fetchWebResults, fetchImagesResults, fetchCurrencies } from '$lib/functions/api/fetchapi';
+import { CategoryEnum, toCategoryEnumType } from '$lib/types/search/categoryenum';
 import { exchangery, extractExchangeQuery } from '$lib/functions/query/gadgets/exchange';
+import { getCategoryConfigBase64 } from '$lib/functions/categories/convert';
 
 /** @type {import('./$types').PageLoad} */
 export async function load({ url, fetch }) {
@@ -46,15 +47,19 @@ export async function load({ url, fetch }) {
 	// Concatenate search params.
 	const newSearchParams = concatSearchParams([
 		['q', queryWithoutCategory],
-		['category', category !== CategoryEnum.GENERAL ? category : ''],
-		['start', currentPage !== 1 ? currentPage.toString() : ''],
-		['pages', maxPages !== 1 ? maxPages.toString() : '']
+		['category', getCategoryConfigBase64(category)],
+		['start', currentPage.toString()],
+		['pages', maxPages.toString()]
 	]);
 	console.debug('New search params:', newSearchParams);
 	console.debug('New search params string:', newSearchParams.toString());
 
 	// Fetch results.
-	const respP = fetchResults(newSearchParams, fetch);
+	/** @type {Promise<WebResultsResponseType | ImagesResultsResponseType>} */
+	const respP =
+		category === CategoryEnum.IMAGES
+			? fetchImagesResults(newSearchParams, fetch)
+			: fetchWebResults(newSearchParams, fetch);
 
 	// If not an exchange query, return results.
 	if (!exchangery(queryWithoutCategory)) {
@@ -100,7 +105,7 @@ export async function load({ url, fetch }) {
  * Get category from URL or query.
  * @param {string} query - Query from URL.
  * @param {URLSearchParams} params - Parameters.
- * @returns {string} - Category.
+ * @returns {CategoryEnum} - Category.
  * @throws {Error} - If category is invalid.
  */
 function getCategory(query, params) {
@@ -108,9 +113,9 @@ function getCategory(query, params) {
 	const categoryParam = params.get('category') ?? '';
 	const category =
 		categoryFromQuery !== ''
-			? toCategoryType(categoryFromQuery)
+			? toCategoryEnumType(categoryFromQuery)
 			: categoryParam !== ''
-				? toCategoryType(categoryParam)
+				? toCategoryEnumType(categoryParam)
 				: CategoryEnum.GENERAL;
 
 	// Check if category is valid.
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte
index 6cfc3cd9..9e5db092 100644
--- a/src/routes/search/+page.svelte
+++ b/src/routes/search/+page.svelte
@@ -12,7 +12,7 @@
 	import Zero from '$lib/components/results/zero/main.svelte';
 	import General from '$lib/components/results/general/main.svelte';
 	import Images from '$lib/components/results/images/main.svelte';
-	import { CategoryEnum, toDisplayCategory } from '$lib/types/search/category.js';
+	import { assertImagesResultType } from '$lib/types/search/assert.js';
 
 	let { data } = $props();
 
@@ -31,10 +31,10 @@
 	const results = $derived(data.results);
 	const duration = $derived(data.duration);
 
-	/** @type {ResultType | undefined} */
+	/** @type {ImagesResultType | undefined} */
 	let imagePreview = $state(undefined);
 
-	/** @type {import('./$types').Snapshot<ResultType | undefined>} */
+	/** @type {import('./$types').Snapshot<ImagesResultType | undefined>} */
 	export const snapshot = {
 		capture: () => imagePreview,
 		restore: (value) => (imagePreview = value)
@@ -65,7 +65,7 @@
 
 {#if results.length === 0}
 	<Zero />
-{:else if toDisplayCategory(category) === CategoryEnum.IMAGES}
+{:else if assertImagesResultType(results, category)}
 	<Images {browser} {query} {category} {currentPage} {results} bind:imagePreview />
 {:else}
 	<General {browser} {query} {category} {currentPage} {results} />