diff --git a/router.py b/router.py
index 13fd123..5183e10 100644
--- a/router.py
+++ b/router.py
@@ -71,7 +71,7 @@ async def fetch_available_models(endpoint: str) -> Set[str]:
     set is returned.
     """
     try:
-        async with httpx.AsyncClient(timeout=1.0) as client:
+        async with httpx.AsyncClient(timeout=5.0) as client:
             if "/v1" in endpoint:
                 resp = await client.get(f"{endpoint}/models")
             else:
@@ -118,12 +118,12 @@ async def fetch_endpoint_details(endpoint: str, route: str, detail: str) -> List
             resp = await client.get(f"{endpoint}{route}")
             resp.raise_for_status()
             data = resp.json()
-            detail = data.get(detail)
+            detail = data.get(detail, [])
             return detail
     except Exception as e:
         # If anything goes wrong we cannot reply details
         print(e)
-        return {detail: ["N/A"]}
+        return {detail: []}
 
 def ep2base(ep):
     if "/v1" in ep:
@@ -795,7 +795,7 @@ async def ps_proxy(request: Request):
     for modellist in loaded_models:
         models['models'] += modellist
     
-    # 25. Return a JSONResponse with deduplicated currently deployed models
+    # 2. Return a JSONResponse with deduplicated currently deployed models
     return JSONResponse(
         content={"models": dedupe_on_keys(models['models'], ['digest'])},
         status_code=200,