diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
index cb58f3e..45f5dc1 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/[lang]/index.astro
@@ -51,6 +51,7 @@ const t = useTranslations(lang);
 <script>
   import { initSw, setTransport } from "@utils/registerSW.ts"; //../../utils/registerSW.ts
   import { RammerheadEncode } from "@rubynetwork/rammerhead-browser";
+  import { SupportedSites } from "@utils/siteSupport";
   import {
     WispServerURLS,
     SearchEngines,
@@ -64,25 +65,41 @@ const t = useTranslations(lang);
   type Suggestion = {
     phrase: string;
   };
-  async function proxy(term: string) {
-    const searchEngine = localStorage.getItem(
-      Settings.ProxySettings.searchEngine
-    );
-    const proxySelection = localStorage.getItem(Settings.ProxySettings.proxy);
+  async function proxy(term: string, rh: boolean) {
+    const searchEngine = localStorage.getItem(Settings.ProxySettings.searchEngine);
     const openIn = localStorage.getItem(Settings.ProxySettings.openIn);
-    const proxyUrl = proxySelection === "uv" ? __uv$config!.prefix + __uv$config.encodeUrl!(search(term, searchEngine ? SearchEngines[searchEngine] : SearchEngines.ddg)) : await RammerheadEncode(search(term, searchEngine ? SearchEngines[searchEngine] : SearchEngines.ddg));
+    let proxyUrl: any = __uv$config!.prefix + __uv$config.encodeUrl!(search(term, searchEngine ? SearchEngines[searchEngine] : SearchEngines.ddg)); 
+    if (rh) {
+        proxyUrl = await RammerheadEncode(search(term, searchEngine ? SearchEngines[searchEngine] : SearchEngines.ddg));
+    }
     if (openIn === "a:b" || openIn === "blob") {
-      return cloak(
-        openIn as string,
-        "https://google.com",
-        `${window.location.origin}${proxyUrl}`
-      );
-    } else if (openIn === "direct") {
+      return cloak(openIn as string, "https://google.com", `${window.location.origin}${proxyUrl}`);
+    } 
+    else if (openIn === "direct") {
       return (window.location.href = proxyUrl as string);
-    } else {
+    } 
+    else {
       return proxyUrl;
     }
   }
+  function uv(iframe: HTMLIFrameElement, term: string) {
+    initSw().then(() => {
+      setTransport(localStorage.getItem(Settings.ProxySettings.transport) as string).then(async () => {
+        iframe.classList.remove("hidden");
+        const url = await proxy(term, false);
+        if (url) {
+          iframe.src = url as string;
+        }
+      });
+    });
+  }
+  async function rh(iframe: HTMLIFrameElement, term: string) {
+    iframe.classList.remove("hidden");
+    const url = await proxy(term, true);
+    if (url) {
+      iframe.src = "/" + url as string;
+    }
+  }
   //we need to rerun this on every page load
   document.addEventListener("astro:page-load", async function () {
     //wrap this in a try catch as sometimes this element will not be available on the page
@@ -92,26 +109,26 @@ const t = useTranslations(lang);
       const omnibox = document.getElementById("omnibox") as HTMLDivElement;
       input?.addEventListener("keypress", async function (event: any) {
         if (event.key === "Enter") {
-          if (localStorage.getItem(Settings.ProxySettings.proxy) === "uv" || localStorage.getItem(Settings.ProxySettings.proxy) === "automatic") {
-            initSw().then(() => {
-                setTransport(
-                localStorage.getItem(Settings.ProxySettings.transport) as string
-                ).then(async () => {
-                    iframe.classList.remove("hidden");
-                    const url = await proxy(input?.value);
-                    if (url) {
-                        iframe.src = url as string;
-                    }
-                });
-            });
-          }
-          else {
-              iframe.classList.remove("hidden");
-              const url = await proxy(input?.value);
-              if (url) {
-                  iframe.src = "/" + url as string;
+          if (localStorage.getItem(Settings.ProxySettings.proxy) === "automatic") {
+              const key = SupportedSites[input?.value];
+              switch(key) {
+                  case "uv":
+                      uv(iframe, input?.value);
+                      break;
+                  case "rh":
+                      rh(iframe, input?.value);
+                      break;
+                  default:
+                      uv(iframe, input?.value);
+                      break;
               }
           }
+          else if (localStorage.getItem(Settings.ProxySettings.proxy) === "uv") {
+            uv(iframe, input?.value);
+          }
+          else if (localStorage.getItem(Settings.ProxySettings.proxy) === "rh") { 
+            rh(iframe, input?.value);
+          }
         }
       });
       input?.addEventListener("input", async function () {
diff --git a/src/utils/settings.ts b/src/utils/settings.ts
index f44ddcc..4a7951c 100644
--- a/src/utils/settings.ts
+++ b/src/utils/settings.ts
@@ -125,4 +125,4 @@ const proxySettings = {
   }
 };
 
-export { tabSettings, proxySettings, Settings, WispServerURLS, SearchEngines, cloak };
+export { tabSettings, proxySettings, Settings, WispServerURLS, SearchEngines, cloak, type Proxy };
diff --git a/src/utils/siteSupport.ts b/src/utils/siteSupport.ts
new file mode 100644
index 0000000..2c02ad6
--- /dev/null
+++ b/src/utils/siteSupport.ts
@@ -0,0 +1,13 @@
+import type { Proxy } from "./settings";
+type ProxyChoices = Exclude<Proxy, "automatic">
+
+const SupportedSites: Record<string, ProxyChoices> = {
+    "discord.gg": "uv",
+    "discord.com": "uv",
+    "spotify.com": "rh",
+    "spotify.link": "rh",
+    "youtube.com": "uv",
+    "youtu.be": "uv"
+}
+
+export { SupportedSites }