diff --git a/Limoka.py b/Limoka.py
index ff0f7d9..48b75eb 100644
--- a/Limoka.py
+++ b/Limoka.py
@@ -391,9 +391,9 @@ class Limoka(loader.Module):
         else:
             self.ix = open_dir("limoka_search")
         self._history = self.pointer("history", [])
-        self.modules = await self.api.fetch_json(
+        self.modules = (await self.api.fetch_json(
             self._base_url, "modules.json"
-        )
+        )).get("modules", {})
         raw = (await self.api.fetch_json(
             self._base_url, "repositories.json"
         )).get("repositories", [])
@@ -433,7 +433,7 @@ class Limoka(loader.Module):
     async def _update_index(self):
         writer = self.ix.writer()
         modules_to_index = self._filter_newbies(self.modules)
-        for module_path, module_data in modules_to_index["modules"].items():
+        for module_path, module_data in modules_to_index.items():
             writer.add_document(
                 title=module_data["name"],
                 path=module_path,
@@ -529,7 +529,7 @@ class Limoka(loader.Module):
         repo_key = "/".join(module_path.split("/")[:2]) if "/" in module_path else module_path
         tags_list = []
         for x in self.repositories:
-            if x.replace("https://github.com/") == repo_key:
+            if x.replace("https://github.com/", "") == repo_key:
                 tags_list = self.repositories.get(x, {}).get("tags", [])
                 break
         tags_text = ", ".join(self.strings["tags"].get(tag, tag) for tag in tags_list)