diff --git a/endpoints/radio.py b/endpoints/radio.py
index a98e398..6a680c5 100644
--- a/endpoints/radio.py
+++ b/endpoints/radio.py
@@ -96,13 +96,15 @@ class Radio(FastAPI):
         except Exception as e:
             logging.debug("radio_skip Exception: %s", str(e))
             traceback.print_exc()
-            return JSONResponse(
-                status_code=500,
-                content={
-                    "err": True,
-                    "errorText": "General failure.",
-                },
+            if not isinstance(e, HTTPException):
+                return JSONResponse(
+                    status_code=500,
+                    content={
+                        "err": True,
+                        "errorText": "General failure.",
+                    },
             )
+            raise e # Re-raise HTTPException
 
     async def radio_reshuffle(
         self, data: ValidRadioReshuffleRequest, request: Request
diff --git a/endpoints/yt.py b/endpoints/yt.py
index 3223e7b..bb25dc0 100644
--- a/endpoints/yt.py
+++ b/endpoints/yt.py
@@ -26,10 +26,7 @@ class YT(FastAPI):
             )
 
     async def yt_video_search_handler(self, data: ValidYTSearchRequest) -> JSONResponse:
-        """
-        Search for YT Video by Title (closest match returned)
-        - **t**: Title to search
-        """
+        """Search for YT Video by Title (closest match returned)"""
 
         title: str = data.t
         yts_res: Optional[list[dict]] = await self.ytsearch.search(title)
diff --git a/utils/radio_util.py b/utils/radio_util.py
index 94150a4..9b3ac92 100644
--- a/utils/radio_util.py
+++ b/utils/radio_util.py
@@ -50,13 +50,13 @@ class RadioUtil:
             "/usr/local/share", "sqlite_dbs", "track_album_art.db"
         )
         self.playback_genres: list[str] = [
-            "post-hardcore",
-            "post hardcore",
-            "metalcore",
+            # "post-hardcore",
+            # "post hardcore",
+            # "metalcore",
             "deathcore",
-            "edm",
-            "electronic",
-            "hard rock",
+            # "edm",
+            # "electronic",
+            # "hard rock",
         ]
         self.active_playlist: list[dict] = []
         self.playlist_loaded: bool = False