diff --git a/app/database/playlists.py b/app/database/playlists.py
index 432c3b0..3ecb75f 100644
--- a/app/database/playlists.py
+++ b/app/database/playlists.py
@@ -134,6 +134,7 @@ class PlaylistResp(PlaylistBase):
 
     @classmethod
     async def from_db(cls, playlist: Playlist) -> "PlaylistResp":
-        resp = cls.model_validate(playlist)
-        resp.beatmap = await BeatmapResp.from_db(playlist.beatmap)
+        data = playlist.model_dump()
+        data["beatmap"] = await BeatmapResp.from_db(playlist.beatmap, from_set=True)
+        resp = cls.model_validate(data)
         return resp
diff --git a/app/router/room.py b/app/router/room.py
index 800c861..5f3a684 100644
--- a/app/router/room.py
+++ b/app/router/room.py
@@ -37,10 +37,10 @@ async def get_all_rooms(
     rooms = MultiplayerHubs.rooms.values()
     resp_list: list[RoomResp] = []
     for room in rooms:
-        if category == "realtime" and room.category != "normal":
-            continue
-        elif category != room.category:
-            continue
+        # if category == "realtime" and room.category != "normal":
+        #     continue
+        # elif category != room.category and category != "":
+        #     continue
         resp_list.append(await RoomResp.from_hub(room))
     return resp_list
 
@@ -99,6 +99,6 @@ async def create_room(
         hub=MultiplayerHubs,
     )
     MultiplayerHubs.rooms[db_room.id] = server_room
-    created_room = APICreatedRoom.model_validate(db_room)
+    created_room = APICreatedRoom.model_validate(await RoomResp.from_db(db_room))
     created_room.error = ""
     return created_room