diff --git a/src/controllers/room_services.ts b/src/controllers/room_services.ts
index 40a1885..5ae0f00 100644
--- a/src/controllers/room_services.ts
+++ b/src/controllers/room_services.ts
@@ -163,8 +163,7 @@ export class RoomServicesController {
             const offset = (param.page - 1) * param.limit;
             let limit = param.limit;
 
-            const res_count = query;
-            const res_list = query
+            const base_query = query
                 .select([
                     "Service.id",
                     "Service.name",
@@ -183,10 +182,10 @@ export class RoomServicesController {
                 .innerJoin("Service.servicefare", "serviceFare")
                 .innerJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id")
                 .innerJoin("serviceFare.faretype", "fareType")
-                // .leftJoin("Service.servicefare", "serviceFare")
-                // .leftJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id")
-                // .leftJoin("serviceFare.faretype", "fareType")
-                .where("room.id = :roomId", { roomId })
+                .andWhere("room.id = :roomId", { roomId });
+
+            const res_count = base_query.clone();
+            const res_list = base_query
                 .orderBy("Service." + param.order_field, param.order_direction)
                 .skip(offset)
                 .take(limit);