diff --git a/discordgsm/protocols/asa.py b/discordgsm/protocols/asa.py
index 8ed96fb..1415cc7 100644
--- a/discordgsm/protocols/asa.py
+++ b/discordgsm/protocols/asa.py
@@ -48,15 +48,15 @@ async def query(self):
         settings = dict(info.get("settings", {}))
 
         result: GamedigResult = {
-            "name": attributes.get("CUSTOMSERVERNAME_s", "Unknown Server"),
-            "map": attributes.get("MAPNAME_s", "Unknown Map"),
+            "name": attributes.get("CUSTOMSERVERNAME_s", ""),
+            "map": attributes.get("MAPNAME_s", ""),
             "password": attributes.get("SERVERPASSWORD_b", False),
             "numplayers": info.get("totalPlayers", 0),
             "numbots": 0,
             "maxplayers": settings.get("maxPublicPlayers", 0),
             "players": None,
             "bots": None,
-            "connect": attributes.get("ADDRESS_s", "") + ":" + str(port),
+            "connect": f"{host}:{port}",
             "ping": ping,
             "raw": info,
         }
diff --git a/discordgsm/protocols/palworld.py b/discordgsm/protocols/palworld.py
index 0ef4bcb..1b60bca 100644
--- a/discordgsm/protocols/palworld.py
+++ b/discordgsm/protocols/palworld.py
@@ -88,8 +88,8 @@ async def query(self):
         settings = dict(info.get("settings", {}))
 
         result: GamedigResult = {
-            "name": attributes.get("NAME_s", "Unknown Server"),
-            "map": "",
+            "name": attributes.get("NAME_s", ""),
+            "map": attributes.get("MAPNAME_s", ""),
             "password": attributes.get("ISPASSWORD_b", False),
             "numplayers": attributes.get("PLAYERS_l", 0),
             "numbots": 0,
diff --git a/discordgsm/protocols/theisleevrima.py b/discordgsm/protocols/theisleevrima.py
index ebae217..1144c73 100644
--- a/discordgsm/protocols/theisleevrima.py
+++ b/discordgsm/protocols/theisleevrima.py
@@ -48,15 +48,15 @@ async def query(self):
         settings = dict(info.get("settings", {}))
 
         result: GamedigResult = {
-            "name": attributes.get("SERVERNAME_s", "Unknown Server"),
-            "map": attributes.get("MAP_NAME_s", "Unknown Map"),
+            "name": attributes.get("SERVERNAME_s", ""),
+            "map": attributes.get("MAP_NAME_s", ""),
             "password": attributes.get("PASSWORD_ENABLED_b", False),
             "numplayers": info.get("totalPlayers", 0),
             "numbots": 0,
             "maxplayers": settings.get("maxPublicPlayers", 0),
             "players": None,
             "bots": None,
-            "connect": attributes.get("ADDRESS_s", "") + ":" + str(port),
+            "connect": f"{host}:{port}",
             "ping": ping,
             "raw": info,
         }
diff --git a/discordgsm/version.py b/discordgsm/version.py
index 37a2f4f..b34264c 100644
--- a/discordgsm/version.py
+++ b/discordgsm/version.py
@@ -1 +1 @@
-__version__ = '2.16.1'
+__version__ = '2.16.2'