diff --git a/comet/api/core.py b/comet/api/core.py
index 9435df0..8b14cce 100644
--- a/comet/api/core.py
+++ b/comet/api/core.py
@@ -23,8 +23,8 @@ async def health():
 indexers = settings.INDEXER_MANAGER_INDEXERS
 
 webConfig = {
-    "indexers": indexers,
-    "languages": [indexer.replace(" ", "_") for indexer in RTN.patterns.language_code_mapping.keys()],
+    "indexers": [indexer.replace(" ", "_") for indexer in indexers],
+    "languages": [language.replace(" ", "_") for language in RTN.patterns.language_code_mapping.keys()],
     "resolutions": ["480p", "720p", "1080p", "1440p", "2160p", "2880p", "4320p"]
 }
 
diff --git a/comet/api/stream.py b/comet/api/stream.py
index 7e11181..bc0aa26 100644
--- a/comet/api/stream.py
+++ b/comet/api/stream.py
@@ -120,7 +120,7 @@ async def stream(request: Request, b64config: str, type: str, id: str):
                 filtered += 1
 
                 continue
-            if not "All" in config["languages"] and not parsedTorrent.is_multi_audio and not any(language in parsedTorrent.language for language in config["languages"]):
+            if not "All" in config["languages"] and not parsedTorrent.is_multi_audio and not any(language.replace("_", " ") in parsedTorrent.language for language in config["languages"]):
                 filtered += 1
 
                 continue
diff --git a/comet/utils/general.py b/comet/utils/general.py
index b636740..d83260d 100644
--- a/comet/utils/general.py
+++ b/comet/utils/general.py
@@ -32,7 +32,6 @@ translationTable = {
 
 translationTable = str.maketrans(translationTable)
 infoHashPattern = re.compile(r"\b([a-fA-F0-9]{40})\b")
-lang_code_map = [indexer.replace(" ", "_") for indexer in language_code_mapping.keys()]
 
 def translate(title: str):
     return title.translate(translationTable)
@@ -76,7 +75,7 @@ def configChecking(b64config: str):
 
 async def getIndexerManager(session: aiohttp.ClientSession, indexerManagerType: str, indexers: list, query: str):
     try:
-        indexers = [indexer.lower() for indexer in indexers]
+        indexers = [indexer.lower().replace("_", " ") for indexer in indexers]
 
         timeout = aiohttp.ClientTimeout(total=settings.INDEXER_MANAGER_TIMEOUT)
         results = []