From b2935114e32976a7c2ff814c29d48fb35a5f325a Mon Sep 17 00:00:00 2001
From: Christel Westerberg <christel.westerberg@scandichotels.com>
Date: Mon, 13 Jan 2025 14:26:38 +0100
Subject: [PATCH] refactor: url management in hotel reservation flow

---
 .../(standard)/page.module.css                |   3 +-
 .../(standard)/select-hotel/map/page.tsx      |  11 +-
 .../(standard)/select-hotel/page.tsx          |   6 +-
 .../(standard)/select-rate/page.tsx           |  13 +-
 .../hotelreservation/(standard)/step/page.tsx |  16 +-
 .../hotelreservation/(standard)/utils.ts      |  51 +++---
 .../[contentType]/[uid]/page.tsx              |  17 +-
 .../@bookingwidget/hotelreservation/page.tsx  |   7 +-
 app/[lang]/(live)/@bookingwidget/page.tsx     |   5 +-
 app/[lang]/(live-current)/layout.tsx          |   1 -
 components/BookingWidget/Client.tsx           |  25 ++-
 .../MobileToggleButton/index.tsx              |   4 +-
 components/BookingWidget/index.tsx            |   4 +-
 .../Forms/BookingWidget/form.module.css       |   4 +
 components/Forms/BookingWidget/index.tsx      |  27 +--
 components/Forms/BookingWidget/schema.ts      |   6 +-
 .../ChildSelector/ChildInfoSelector.tsx       |  10 +-
 .../GuestsRoomsPicker/ChildSelector/index.tsx |   4 +-
 components/GuestsRoomsPicker/Form.tsx         |   2 +-
 .../GuestsRoomsPicker/GuestsRoom/index.tsx    |   6 +-
 components/GuestsRoomsPicker/index.tsx        |   7 +-
 .../BookingConfirmation/index.tsx             |   2 +-
 .../Payment/PaymentCallback/index.tsx         |   8 +-
 .../EnterDetails/Payment/PaymentClient.tsx    |  20 +--
 .../SelectHotelMapContainer.tsx               |  16 +-
 .../HotelReservation/SelectHotel/index.tsx    |  24 +--
 .../SelectRate/HotelInfoCard/NoRoomsAlert.tsx |   2 +-
 .../SelectRate/RoomFilter/index.tsx           |   3 +-
 .../RoomSelection/RoomCard/index.tsx          |   2 +-
 .../SelectRate/RoomSelection/index.tsx        |  39 ++--
 .../SelectRate/RoomSelection/utils.ts         | 113 ------------
 .../SelectRate/Rooms/RoomsContainer.tsx       |   2 +-
 .../HotelReservation/SelectRate/utils.ts      |  19 --
 components/HotelReservation/utils.ts          |  47 +++++
 middlewares/dateFormat.ts                     |  14 +-
 next.config.js                                |  16 +-
 stores/enter-details/helpers.ts               |   9 +-
 .../useEnterDetailsStore.test.tsx             |   2 +-
 .../bookingWidget/guestsRoomsPicker.ts        |  12 +-
 types/components/bookingWidget/index.ts       |   9 +-
 .../enterDetails/bookingData.ts               |  17 --
 .../hotelReservation/selectHotel/map.ts       |   4 +-
 .../selectHotel/selectHotel.ts                |   3 +-
 .../selectHotel/selectHotelSearchParams.ts    |  14 +-
 .../hotelReservation/selectRate/selectRate.ts |  19 +-
 types/providers/enter-details.ts              |   5 +-
 types/stores/enter-details.ts                 |   6 +-
 utils/url.ts                                  | 169 +++++++++++++++---
 48 files changed, 407 insertions(+), 418 deletions(-)
 delete mode 100644 components/HotelReservation/SelectRate/RoomSelection/utils.ts
 delete mode 100644 components/HotelReservation/SelectRate/utils.ts
 create mode 100644 components/HotelReservation/utils.ts
 delete mode 100644 types/components/hotelReservation/enterDetails/bookingData.ts

diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/page.module.css b/app/[lang]/(live)/(public)/hotelreservation/(standard)/page.module.css
index 3446c2a84..fe7743861 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/page.module.css
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/page.module.css
@@ -1,7 +1,8 @@
 .page {
   background-color: var(--Base-Background-Primary-Normal);
   min-height: 50dvh;
-  max-width: var(--max-width);
+  max-width: var(--max-width-page);
+  margin: 0 auto;
   display: flex;
   align-items: center;
   justify-content: center;
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx
index 236acc354..9a9c357bb 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx
@@ -20,8 +20,13 @@ export default async function SelectHotelMapPage({
   setLang(params.lang)
   const searchDetails = await getHotelSearchDetails({ searchParams })
   if (!searchDetails) return notFound()
-  const { city, adultsInRoom, childrenInRoom, childrenInRoomArray } =
-    searchDetails
+  const {
+    city,
+    adultsInRoom,
+    childrenInRoom,
+    childrenInRoomArray,
+    selectHotelParams,
+  } = searchDetails
 
   if (!city) return notFound()
 
@@ -34,7 +39,7 @@ export default async function SelectHotelMapPage({
         >
           <SelectHotelMapContainer
             city={city}
-            searchParams={searchParams}
+            selectHotelParams={selectHotelParams}
             adultsInRoom={adultsInRoom}
             childrenInRoom={childrenInRoom}
             child={childrenInRoomArray}
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
index ddde1cf40..62ec53e45 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
@@ -3,7 +3,6 @@ import { Suspense } from "react"
 
 import SelectHotel from "@/components/HotelReservation/SelectHotel"
 import { SelectHotelSkeleton } from "@/components/HotelReservation/SelectHotel/SelectHotelSkeleton"
-import { getHotelReservationQueryParams } from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
 import { setLang } from "@/i18n/serverContext"
 
 import { getHotelSearchDetails } from "../utils"
@@ -20,7 +19,7 @@ export default async function SelectHotelPage({
   if (!searchDetails) return notFound()
   const {
     city,
-    urlSearchParams,
+    selectHotelParams,
     adultsInRoom,
     childrenInRoom,
     childrenInRoomArray,
@@ -29,8 +28,7 @@ export default async function SelectHotelPage({
   if (!city) return notFound()
 
   const reservationParams = {
-    selectHotelParams: urlSearchParams,
-    searchParams,
+    selectHotelParams,
     adultsInRoom,
     childrenInRoom,
     childrenInRoomArray,
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
index 3ff47c7c3..bd1d20358 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
@@ -29,7 +29,8 @@ export default async function SelectRatePage({
   setLang(params.lang)
   const searchDetails = await getHotelSearchDetails({ searchParams })
   if (!searchDetails) return notFound()
-  const { hotel, adultsInRoom, childrenInRoomArray } = searchDetails
+  const { hotel, adultsInRoom, childrenInRoomArray, selectHotelParams } =
+    searchDetails
 
   if (!hotel) return notFound()
 
@@ -39,12 +40,12 @@ export default async function SelectRatePage({
   })
 
   const { fromDate, toDate } = getValidDates(
-    searchParams.fromDate,
-    searchParams.toDate
+    selectHotelParams.fromDate,
+    selectHotelParams.toDate
   )
 
-  const arrivalDate = new Date(searchParams.fromDate)
-  const departureDate = new Date(searchParams.toDate)
+  const arrivalDate = fromDate.toDate()
+  const departureDate = toDate.toDate()
 
   const pageTrackingData: TrackingSDKPageData = {
     pageId: "select-rate",
@@ -57,7 +58,7 @@ export default async function SelectRatePage({
   }
 
   const hotelsTrackingData: TrackingSDKHotelInfo = {
-    searchTerm: searchParams.city ?? hotel?.name,
+    searchTerm: selectHotelParams.city ?? hotel?.name,
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     departureDate: format(departureDate, "yyyy-MM-dd"),
     noOfAdults: adultsInRoom,
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/step/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/step/page.tsx
index c09914b6b..340a071ad 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/step/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/step/page.tsx
@@ -21,21 +21,19 @@ import SectionAccordion from "@/components/HotelReservation/EnterDetails/Section
 import SelectedRoom from "@/components/HotelReservation/EnterDetails/SelectedRoom"
 import DesktopSummary from "@/components/HotelReservation/EnterDetails/Summary/Desktop"
 import MobileSummary from "@/components/HotelReservation/EnterDetails/Summary/Mobile"
-import {
-  generateChildrenString,
-  getQueryParamsForEnterDetails,
-} from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
+import { generateChildrenString } from "@/components/HotelReservation/utils"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
 import { setLang } from "@/i18n/serverContext"
 import EnterDetailsProvider from "@/providers/EnterDetailsProvider"
+import { convertSearchParamsToObj } from "@/utils/url"
 
 import EnterDetailsTracking from "./enterDetailsTracking"
 
 import styles from "./page.module.css"
 
 import { ChildBedMapEnum } from "@/types/components/bookingWidget/enums"
-import type { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
+import { type SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
 import {
   TrackingChannelEnum,
   type TrackingSDKHotelInfo,
@@ -61,10 +59,10 @@ export default async function StepPage({
   const selectRoomParams = new URLSearchParams(searchParams)
   // Deleting step to avoid double searchparams after rewrite
   selectRoomParams.delete("step")
-  const booking = getQueryParamsForEnterDetails(selectRoomParams)
+  const booking = convertSearchParamsToObj<SelectRateSearchParams>(searchParams)
 
   const {
-    hotel: hotelId,
+    hotelId,
     rooms: [
       { adults, children, roomTypeCode, rateCode, packages: packageCodes },
     ], // TODO: Handle multiple rooms
@@ -153,8 +151,8 @@ export default async function StepPage({
       }
     : undefined
 
-  const arrivalDate = new Date(searchParams.fromDate)
-  const departureDate = new Date(searchParams.toDate)
+  const arrivalDate = new Date(fromDate)
+  const departureDate = new Date(toDate)
   const hotelAttributes = hotelData?.data.attributes
 
   const initialPageTrackingData: TrackingSDKPageData = {
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/utils.ts b/app/[lang]/(live)/(public)/hotelreservation/(standard)/utils.ts
index 2a0ae8d42..1b296d273 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/utils.ts
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/utils.ts
@@ -2,10 +2,8 @@ import { notFound } from "next/navigation"
 
 import { getLocations } from "@/lib/trpc/memoizedRequests"
 
-import {
-  generateChildrenString,
-  getHotelReservationQueryParams,
-} from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
+import { generateChildrenString } from "@/components/HotelReservation/utils"
+import { convertSearchParamsToObj } from "@/utils/url"
 
 import type { SelectHotelSearchParams } from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
 import type {
@@ -14,62 +12,59 @@ import type {
 } from "@/types/components/hotelReservation/selectRate/selectRate"
 import type { Location } from "@/types/trpc/routers/hotel/locations"
 
-interface HotelSearchDetails {
+interface HotelSearchDetails<T> {
   city: Location | null
   hotel: Location | null
-  urlSearchParams?: URLSearchParams
+  selectHotelParams: T
   adultsInRoom: number
   childrenInRoom?: string
   childrenInRoomArray?: Child[]
 }
 
-export async function getHotelSearchDetails({
+export async function getHotelSearchDetails<
+  T extends SelectHotelSearchParams | SelectRateSearchParams,
+>({
   searchParams,
 }: {
-  searchParams:
-    | (SelectHotelSearchParams & {
-        [key: string]: string
-      })
-    | (SelectRateSearchParams & {
-        [key: string]: string
-      })
-}): Promise<HotelSearchDetails | null> {
+  searchParams: T & {
+    [key: string]: string
+  }
+}): Promise<HotelSearchDetails<T> | null> {
+  const selectHotelParams = convertSearchParamsToObj<T>(searchParams)
+
   const locations = await getLocations()
 
   if (!locations || "error" in locations) return null
 
   const city = locations.data.find(
     (location) =>
-      location.name.toLowerCase() === searchParams.city?.toLowerCase()
+      location.name.toLowerCase() === selectHotelParams.city?.toLowerCase()
   )
   const hotel = locations.data.find(
     (location) =>
-      "operaId" in location && location.operaId == searchParams.hotel
+      "operaId" in location && location.operaId == selectHotelParams.hotelId
   )
 
   if (!city && !hotel) return notFound()
 
-  const urlSearchParams = new URLSearchParams(searchParams)
-  const searchParamsObject = getHotelReservationQueryParams(urlSearchParams)
-
   let adultsInRoom = 1
   let childrenInRoom: string | undefined = undefined
   let childrenInRoomArray: Child[] | undefined = undefined
 
-  if (searchParamsObject.room && searchParamsObject.room.length > 0) {
-    adultsInRoom = searchParamsObject.room[0].adults // TODO: Handle multiple rooms
-    childrenInRoom = searchParamsObject.room[0].child
-      ? generateChildrenString(searchParamsObject.room[0].child)
-      : undefined // TODO: Handle multiple rooms
-    childrenInRoomArray = searchParamsObject.room[0].child
-      ? searchParamsObject.room[0].child
+  const { rooms } = selectHotelParams
+
+  if (rooms && rooms.length > 0) {
+    adultsInRoom = rooms[0].adults // TODO: Handle multiple rooms
+    childrenInRoom = rooms[0].children
+      ? generateChildrenString(rooms[0].children)
       : undefined // TODO: Handle multiple rooms
+    childrenInRoomArray = rooms[0].children ? rooms[0].children : undefined // TODO: Handle multiple rooms
   }
 
   return {
     city: city ?? null,
     hotel: hotel ?? null,
-    urlSearchParams,
+    selectHotelParams,
     adultsInRoom,
     childrenInRoom,
     childrenInRoomArray,
diff --git a/app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx b/app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx
index 2f3916668..e840242a4 100644
--- a/app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx
+++ b/app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx
@@ -4,21 +4,20 @@ import { getHotelData, getHotelPage } from "@/lib/trpc/memoizedRequests"
 import BookingWidget, { preload } from "@/components/BookingWidget"
 import { getLang } from "@/i18n/serverContext"
 
+import type { BookingWidgetSearchData } from "@/types/components/bookingWidget"
 import type { ContentTypeParams, PageArgs } from "@/types/params"
 import { PageContentTypeEnum } from "@/types/requests/contentType"
 
 export default async function BookingWidgetPage({
   params,
   searchParams,
-}: PageArgs<ContentTypeParams, URLSearchParams>) {
+}: PageArgs<ContentTypeParams, BookingWidgetSearchData>) {
   if (!env.ENABLE_BOOKING_WIDGET) {
     return null
   }
 
   preload()
 
-  const urlParams = new URLSearchParams()
-
   if (params.contentType === PageContentTypeEnum.hotelPage) {
     const hotelPageData = await getHotelPage()
 
@@ -26,10 +25,14 @@ export default async function BookingWidgetPage({
       hotelId: hotelPageData?.hotel_page_id || "",
       language: getLang(),
     })
-    urlParams.set("hotel", hotelData?.data?.id || "")
-    urlParams.set("city", hotelData?.data?.attributes?.cityName || "")
 
-    return <BookingWidget searchParams={urlParams} />
+    const hotelPageParams = {
+      hotel: hotelData?.data?.id || "",
+      city: hotelData?.data?.attributes?.cityName || "",
+    }
+
+    return <BookingWidget bookingWidgetSearchParams={hotelPageParams} />
   }
-  return <BookingWidget searchParams={searchParams} />
+
+  return <BookingWidget bookingWidgetSearchParams={searchParams} />
 }
diff --git a/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx b/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
index a6d940572..4e4b9d496 100644
--- a/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
+++ b/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
@@ -2,16 +2,17 @@ import { env } from "@/env/server"
 
 import BookingWidget, { preload } from "@/components/BookingWidget"
 
-import type { PageArgs } from "@/types/params"
+import type { BookingWidgetSearchData } from "@/types/components/bookingWidget"
+import type { LangParams, PageArgs } from "@/types/params"
 
 export default async function BookingWidgetPage({
   searchParams,
-}: PageArgs<{}, URLSearchParams>) {
+}: PageArgs<LangParams, BookingWidgetSearchData>) {
   if (!env.ENABLE_BOOKING_WIDGET_HOTELRESERVATION_PATH) {
     return null
   }
 
   preload()
 
-  return <BookingWidget searchParams={searchParams} />
+  return <BookingWidget bookingWidgetSearchParams={searchParams} />
 }
diff --git a/app/[lang]/(live)/@bookingwidget/page.tsx b/app/[lang]/(live)/@bookingwidget/page.tsx
index 93e81d617..224ffe7d0 100644
--- a/app/[lang]/(live)/@bookingwidget/page.tsx
+++ b/app/[lang]/(live)/@bookingwidget/page.tsx
@@ -3,11 +3,12 @@ import { serverClient } from "@/lib/trpc/server"
 
 import BookingWidget, { preload } from "@/components/BookingWidget"
 
+import type { BookingWidgetSearchData } from "@/types/components/bookingWidget"
 import type { PageArgs } from "@/types/params"
 
 export default async function BookingWidgetPage({
   searchParams,
-}: PageArgs<{}, URLSearchParams>) {
+}: PageArgs<{}, BookingWidgetSearchData>) {
   if (!env.ENABLE_BOOKING_WIDGET) {
     return null
   }
@@ -22,5 +23,5 @@ export default async function BookingWidgetPage({
     return null
   }
 
-  return <BookingWidget searchParams={searchParams} />
+  return <BookingWidget bookingWidgetSearchParams={searchParams} />
 }
diff --git a/app/[lang]/(live-current)/layout.tsx b/app/[lang]/(live-current)/layout.tsx
index 3867b76d1..ef9477a87 100644
--- a/app/[lang]/(live-current)/layout.tsx
+++ b/app/[lang]/(live-current)/layout.tsx
@@ -4,7 +4,6 @@ import "@scandic-hotels/design-system/style.css"
 import Script from "next/script"
 
 import TokenRefresher from "@/components/Auth/TokenRefresher"
-import BookingWidget from "@/components/BookingWidget"
 import CookieBotConsent from "@/components/CookieBot"
 import AdobeScript from "@/components/Current/AdobeScript"
 import Footer from "@/components/Current/Footer"
diff --git a/components/BookingWidget/Client.tsx b/components/BookingWidget/Client.tsx
index 017d9c76a..9901b0439 100644
--- a/components/BookingWidget/Client.tsx
+++ b/components/BookingWidget/Client.tsx
@@ -14,7 +14,7 @@ import { CloseLargeIcon } from "@/components/Icons"
 import useStickyPosition from "@/hooks/useStickyPosition"
 import { debounce } from "@/utils/debounce"
 import isValidJson from "@/utils/isValidJson"
-import { getFormattedUrlQueryParams } from "@/utils/url"
+import { convertSearchParamsToObj } from "@/utils/url"
 
 import MobileToggleButton, {
   MobileToggleButtonSkeleton,
@@ -25,14 +25,14 @@ import styles from "./bookingWidget.module.css"
 import type {
   BookingWidgetClientProps,
   BookingWidgetSchema,
-  BookingWidgetSearchParams,
+  BookingWidgetSearchData,
 } from "@/types/components/bookingWidget"
 import type { Location } from "@/types/trpc/routers/hotel/locations"
 
 export default function BookingWidgetClient({
   locations,
   type,
-  searchParams,
+  bookingWidgetSearchParams,
 }: BookingWidgetClientProps) {
   const [isOpen, setIsOpen] = useState(false)
   const bookingWidgetRef = useRef(null)
@@ -41,14 +41,11 @@ export default function BookingWidgetClient({
     name: StickyElementNameEnum.BOOKING_WIDGET,
   })
 
-  const bookingWidgetSearchData: BookingWidgetSearchParams | undefined =
-    searchParams
-      ? getFormattedUrlQueryParams(new URLSearchParams(searchParams), {
-          adults: "number",
-          age: "number",
-          bed: "number",
-        })
-      : undefined
+  const bookingWidgetSearchData = bookingWidgetSearchParams
+    ? convertSearchParamsToObj<BookingWidgetSearchData>(
+        bookingWidgetSearchParams
+      )
+    : undefined
 
   const getLocationObj = (destination: string): Location | undefined => {
     if (destination) {
@@ -85,13 +82,13 @@ export default function BookingWidgetClient({
       )
     : undefined
 
-  const defaultRoomsData = bookingWidgetSearchData?.room?.map((room) => ({
+  const defaultRoomsData = bookingWidgetSearchData?.rooms?.map((room) => ({
     adults: room.adults,
-    child: room.child ?? [],
+    children: room.children ?? [],
   })) ?? [
     {
       adults: 1,
-      child: [],
+      children: [],
     },
   ]
 
diff --git a/components/BookingWidget/MobileToggleButton/index.tsx b/components/BookingWidget/MobileToggleButton/index.tsx
index f7229ae02..54239d936 100644
--- a/components/BookingWidget/MobileToggleButton/index.tsx
+++ b/components/BookingWidget/MobileToggleButton/index.tsx
@@ -49,8 +49,8 @@ export default function MobileToggleButton({
     return acc
   }, 0)
   const totalChildren = rooms.reduce((acc, room) => {
-    if (room.child) {
-      acc = acc + room.child.length
+    if (room.children) {
+      acc = acc + room.children.length
     }
     return acc
   }, 0)
diff --git a/components/BookingWidget/index.tsx b/components/BookingWidget/index.tsx
index ecff629c6..456ff9777 100644
--- a/components/BookingWidget/index.tsx
+++ b/components/BookingWidget/index.tsx
@@ -10,7 +10,7 @@ export function preload() {
 
 export default async function BookingWidget({
   type,
-  searchParams,
+  bookingWidgetSearchParams,
 }: BookingWidgetProps) {
   const locations = await getLocations()
   const siteConfig = await getSiteConfig()
@@ -23,7 +23,7 @@ export default async function BookingWidget({
     <BookingWidgetClient
       locations={locations.data}
       type={type}
-      searchParams={searchParams}
+      bookingWidgetSearchParams={bookingWidgetSearchParams}
     />
   )
 }
diff --git a/components/Forms/BookingWidget/form.module.css b/components/Forms/BookingWidget/form.module.css
index baa541be1..d8c0cb4e2 100644
--- a/components/Forms/BookingWidget/form.module.css
+++ b/components/Forms/BookingWidget/form.module.css
@@ -10,6 +10,10 @@
 }
 
 @media screen and (max-width: 767px) {
+  .section {
+    max-width: var(--max-width-page);
+  }
+
   .form {
     align-self: flex-start;
   }
diff --git a/components/Forms/BookingWidget/index.tsx b/components/Forms/BookingWidget/index.tsx
index 3d0a67b20..011029e6d 100644
--- a/components/Forms/BookingWidget/index.tsx
+++ b/components/Forms/BookingWidget/index.tsx
@@ -6,6 +6,7 @@ import { useFormContext } from "react-hook-form"
 import { selectHotel, selectRate } from "@/constants/routes/hotelReservation"
 
 import useLang from "@/hooks/useLang"
+import { convertObjToSearchParams } from "@/utils/url"
 
 import FormContent, { BookingWidgetFormContentSkeleton } from "./FormContent"
 import { bookingWidgetVariants } from "./variants"
@@ -37,26 +38,14 @@ export default function Form({
 
     const bookingFlowPage =
       locationData.type == "cities" ? selectHotel(lang) : selectRate(lang)
-    const bookingWidgetParams = new URLSearchParams(data.date)
-
-    if (locationData.type == "cities")
-      bookingWidgetParams.set("city", locationData.name)
-    else bookingWidgetParams.set("hotel", locationData.operaId || "")
-
-    data.rooms.forEach((room, index) => {
-      bookingWidgetParams.set(`room[${index}].adults`, room.adults.toString())
-
-      room.child.forEach((child, childIndex) => {
-        bookingWidgetParams.set(
-          `room[${index}].child[${childIndex}].age`,
-          child.age.toString()
-        )
-        bookingWidgetParams.set(
-          `room[${index}].child[${childIndex}].bed`,
-          child.bed.toString()
-        )
-      })
+    const bookingWidgetParams = convertObjToSearchParams({
+      rooms: data.rooms,
+      ...data.date,
+      ...(locationData.type == "cities"
+        ? { city: locationData.name }
+        : { hotel: locationData.operaId || "" }),
     })
+
     onClose()
     router.push(`${bookingFlowPage}?${bookingWidgetParams.toString()}`)
   }
diff --git a/components/Forms/BookingWidget/schema.ts b/components/Forms/BookingWidget/schema.ts
index c8beb98d5..f6bafd2d5 100644
--- a/components/Forms/BookingWidget/schema.ts
+++ b/components/Forms/BookingWidget/schema.ts
@@ -6,7 +6,7 @@ import type { Location } from "@/types/trpc/routers/hotel/locations"
 export const guestRoomSchema = z
   .object({
     adults: z.number().default(1),
-    child: z
+    children: z
       .array(
         z.object({
           age: z.number().min(0, "Age is required"),
@@ -16,11 +16,11 @@ export const guestRoomSchema = z
       .default([]),
   })
   .superRefine((value, ctx) => {
-    const childrenInAdultsBed = value.child.filter(
+    const childrenInAdultsBed = value.children.filter(
       (c) => c.bed === ChildBedMapEnum.IN_ADULTS_BED
     )
     if (value.adults < childrenInAdultsBed.length) {
-      const lastAdultBedIndex = value.child
+      const lastAdultBedIndex = value.children
         .map((c) => c.bed)
         .lastIndexOf(ChildBedMapEnum.IN_ADULTS_BED)
 
diff --git a/components/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx b/components/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx
index 67ebf4aa7..6f4f845f3 100644
--- a/components/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx
+++ b/components/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx
@@ -29,8 +29,8 @@ export default function ChildInfoSelector({
   index = 0,
   roomIndex = 0,
 }: ChildInfoSelectorProps) {
-  const ageFieldName = `rooms.${roomIndex}.child.${index}.age`
-  const bedFieldName = `rooms.${roomIndex}.child.${index}.bed`
+  const ageFieldName = `rooms.${roomIndex}.children.${index}.age`
+  const bedFieldName = `rooms.${roomIndex}.children.${index}.bed`
   const intl = useIntl()
   const ageLabel = intl.formatMessage({ id: "Age" })
   const bedLabel = intl.formatMessage({ id: "Bed" })
@@ -38,11 +38,11 @@ export default function ChildInfoSelector({
   const { setValue, formState } = useFormContext()
 
   function updateSelectedBed(bed: number) {
-    setValue(`rooms.${roomIndex}.child.${index}.bed`, bed)
+    setValue(`rooms.${roomIndex}.children.${index}.bed`, bed)
   }
 
   function updateSelectedAge(age: number) {
-    setValue(`rooms.${roomIndex}.child.${index}.age`, age)
+    setValue(`rooms.${roomIndex}.children.${index}.age`, age)
     const availableBedTypes = getAvailableBeds(age)
     updateSelectedBed(availableBedTypes[0].value)
   }
@@ -77,7 +77,7 @@ export default function ChildInfoSelector({
   }
 
   //@ts-expect-error: formState is typed with FormValues
-  const roomErrors = formState.errors.rooms?.[roomIndex]?.child?.[index]
+  const roomErrors = formState.errors.rooms?.[roomIndex]?.children?.[index]
 
   const ageError = roomErrors?.age
   const bedError = roomErrors?.bed
diff --git a/components/GuestsRoomsPicker/ChildSelector/index.tsx b/components/GuestsRoomsPicker/ChildSelector/index.tsx
index b76517528..b164b0ded 100644
--- a/components/GuestsRoomsPicker/ChildSelector/index.tsx
+++ b/components/GuestsRoomsPicker/ChildSelector/index.tsx
@@ -24,7 +24,7 @@ export default function ChildSelector({
 
   function increaseChildrenCount(roomIndex: number) {
     if (currentChildren.length < 5) {
-      setValue(`rooms.${roomIndex}.child.${currentChildren.length}`, {
+      setValue(`rooms.${roomIndex}.children.${currentChildren.length}`, {
         age: undefined,
         bed: undefined,
       })
@@ -33,7 +33,7 @@ export default function ChildSelector({
   function decreaseChildrenCount(roomIndex: number) {
     if (currentChildren.length > 0) {
       currentChildren.pop()
-      setValue(`rooms.${roomIndex}.child`, currentChildren)
+      setValue(`rooms.${roomIndex}.children`, currentChildren)
     }
   }
 
diff --git a/components/GuestsRoomsPicker/Form.tsx b/components/GuestsRoomsPicker/Form.tsx
index f1175ef99..da31282b5 100644
--- a/components/GuestsRoomsPicker/Form.tsx
+++ b/components/GuestsRoomsPicker/Form.tsx
@@ -48,7 +48,7 @@ export default function GuestsRoomsPickerDialog({
   }, [trigger, onClose])
 
   const handleAddRoom = useCallback(() => {
-    setValue("rooms", [...roomsValue, { adults: 1, child: [] }], {
+    setValue("rooms", [...roomsValue, { adults: 1, children: [] }], {
       shouldValidate: true,
     })
   }, [roomsValue, setValue])
diff --git a/components/GuestsRoomsPicker/GuestsRoom/index.tsx b/components/GuestsRoomsPicker/GuestsRoom/index.tsx
index 7122a0a31..038db6093 100644
--- a/components/GuestsRoomsPicker/GuestsRoom/index.tsx
+++ b/components/GuestsRoomsPicker/GuestsRoom/index.tsx
@@ -25,7 +25,7 @@ export function GuestsRoom({
   const intl = useIntl()
   const roomLabel = intl.formatMessage({ id: "Room" })
 
-  const childrenInAdultsBed = room.child.filter(
+  const childrenInAdultsBed = room.children.filter(
     (child) => child.bed === ChildBedMapEnum.IN_ADULTS_BED
   ).length
 
@@ -38,13 +38,13 @@ export function GuestsRoom({
         <AdultSelector
           roomIndex={index}
           currentAdults={room.adults}
-          currentChildren={room.child}
+          currentChildren={room.children}
           childrenInAdultsBed={childrenInAdultsBed}
         />
         <ChildSelector
           roomIndex={index}
           currentAdults={room.adults}
-          currentChildren={room.child}
+          currentChildren={room.children}
           childrenInAdultsBed={childrenInAdultsBed}
         />
         {index !== 0 && (
diff --git a/components/GuestsRoomsPicker/index.tsx b/components/GuestsRoomsPicker/index.tsx
index 262b256d9..7edad97d8 100644
--- a/components/GuestsRoomsPicker/index.tsx
+++ b/components/GuestsRoomsPicker/index.tsx
@@ -28,7 +28,8 @@ export default function GuestsRoomsPickerForm() {
   const [isDesktop, setIsDesktop] = useState(true)
   const [isOpen, setIsOpen] = useState(false)
   const [containerHeight, setContainerHeight] = useState(0)
-  const childCount = rooms[0] ? rooms[0].child.length : 0 // ToDo Update for multiroom later
+  const childCount =
+    rooms[0] && rooms[0].children ? rooms[0].children.length : 0 // ToDo Update for multiroom later
 
   const htmlElement =
     typeof window !== "undefined" ? document.querySelector("body") : null
@@ -153,7 +154,7 @@ function Trigger({
     )
   )
 
-  if (rooms.some((room) => room.child.length > 0)) {
+  if (rooms.some((room) => room.children.length > 0)) {
     parts.push(
       intl.formatMessage(
         {
@@ -161,7 +162,7 @@ function Trigger({
         },
         {
           totalChildren: rooms.reduce(
-            (acc, room) => acc + room.child.length,
+            (acc, room) => acc + room.children.length,
             0
           ),
         }
diff --git a/components/HotelReservation/BookingConfirmation/index.tsx b/components/HotelReservation/BookingConfirmation/index.tsx
index 333537b69..fbd1f5093 100644
--- a/components/HotelReservation/BookingConfirmation/index.tsx
+++ b/components/HotelReservation/BookingConfirmation/index.tsx
@@ -6,7 +6,7 @@ import { getBookingConfirmation } from "@/lib/trpc/memoizedRequests"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getLang } from "@/i18n/serverContext"
 
-import { invertedBedTypeMap } from "../SelectRate/RoomSelection/utils"
+import { invertedBedTypeMap } from "../utils"
 import Confirmation from "./Confirmation"
 
 import type { BookingConfirmationProps } from "@/types/components/hotelReservation/bookingConfirmation/bookingConfirmation"
diff --git a/components/HotelReservation/EnterDetails/Payment/PaymentCallback/index.tsx b/components/HotelReservation/EnterDetails/Payment/PaymentCallback/index.tsx
index 88d2e2581..22b8a5d40 100644
--- a/components/HotelReservation/EnterDetails/Payment/PaymentCallback/index.tsx
+++ b/components/HotelReservation/EnterDetails/Payment/PaymentCallback/index.tsx
@@ -5,9 +5,9 @@ import { useEffect } from "react"
 
 import { detailsStorageName } from "@/stores/enter-details"
 
-import { createQueryParamsForEnterDetails } from "@/components/HotelReservation/SelectRate/RoomSelection/utils"
 import LoadingSpinner from "@/components/LoadingSpinner"
 import { trackPaymentEvent } from "@/utils/tracking"
+import { convertObjToSearchParams } from "@/utils/url"
 
 import type { PersistedState } from "@/types/stores/enter-details"
 
@@ -29,7 +29,7 @@ export default function PaymentCallback({
 
     if (bookingData) {
       const detailsStorage: PersistedState = JSON.parse(bookingData)
-      const searchParams = createQueryParamsForEnterDetails(
+      const searchParams = convertObjToSearchParams(
         detailsStorage.booking,
         searchObject
       )
@@ -37,13 +37,13 @@ export default function PaymentCallback({
       if (status === "cancel") {
         trackPaymentEvent({
           event: "paymentCancel",
-          hotelId: detailsStorage.booking.hotel,
+          hotelId: detailsStorage.booking.hotelId,
         })
       }
       if (status === "error") {
         trackPaymentEvent({
           event: "paymentFail",
-          hotelId: detailsStorage.booking.hotel,
+          hotelId: detailsStorage.booking.hotelId,
           errorMessage,
         })
       }
diff --git a/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx b/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx
index 412ab3814..67a3d7f59 100644
--- a/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx
+++ b/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx
@@ -33,7 +33,7 @@ import { usePaymentFailedToast } from "@/hooks/booking/usePaymentFailedToast"
 import useLang from "@/hooks/useLang"
 import { trackPaymentEvent } from "@/utils/tracking"
 
-import { bedTypeMap } from "../../SelectRate/RoomSelection/utils"
+import { bedTypeMap } from "../../utils"
 import PriceChangeDialog from "../PriceChangeDialog"
 import GuaranteeDetails from "./GuaranteeDetails"
 import PaymentOption from "./PaymentOption"
@@ -87,7 +87,7 @@ export default function PaymentClient({
     newPrice: number
   } | null>()
 
-  const { toDate, fromDate, rooms, hotel } = booking
+  const { toDate, fromDate, rooms, hotelId } = booking
 
   usePaymentFailedToast()
 
@@ -171,14 +171,14 @@ export default function PaymentClient({
 
       trackPaymentEvent({
         event: "paymentFail",
-        hotelId: hotel,
+        hotelId,
         method: currentPaymentMethod,
         isSavedCreditCard,
         smsEnable,
         errorMessage,
       })
     },
-    [intl, methods, savedCreditCards, hotel]
+    [intl, methods, savedCreditCards, hotelId]
   )
 
   useEffect(() => {
@@ -226,7 +226,7 @@ export default function PaymentClient({
 
       trackPaymentEvent({
         event: "paymentAttemptStart",
-        hotelId: hotel,
+        hotelId,
         method: paymentMethod,
         isSavedCreditCard: !!savedCreditCard,
         smsEnable: data.smsConfirmation,
@@ -234,7 +234,7 @@ export default function PaymentClient({
 
       initiateBooking.mutate({
         language: lang,
-        hotelId: hotel,
+        hotelId,
         checkInDate: fromDate,
         checkOutDate: toDate,
         rooms: rooms.map((room) => ({
@@ -294,7 +294,7 @@ export default function PaymentClient({
       savedCreditCards,
       lang,
       initiateBooking,
-      hotel,
+      hotelId,
       fromDate,
       toDate,
       rooms,
@@ -347,7 +347,7 @@ export default function PaymentClient({
                       ]
                     }
                     cardNumber={savedCreditCard.truncatedNumber}
-                    hotelId={hotel}
+                    hotelId={hotelId}
                   />
                 ))}
               </div>
@@ -364,7 +364,7 @@ export default function PaymentClient({
                 name="paymentMethod"
                 value={PaymentMethodEnum.card}
                 label={intl.formatMessage({ id: "Credit card" })}
-                hotelId={hotel}
+                hotelId={hotelId}
               />
               {availablePaymentOptions.map((paymentMethod) => (
                 <PaymentOption
@@ -374,7 +374,7 @@ export default function PaymentClient({
                   label={
                     PAYMENT_METHOD_TITLES[paymentMethod as PaymentMethodEnum]
                   }
-                  hotelId={hotel}
+                  hotelId={hotelId}
                 />
               ))}
             </div>
diff --git a/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx b/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx
index e58119e33..d7877094b 100644
--- a/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx
+++ b/components/HotelReservation/SelectHotel/SelectHotelMap/SelectHotelMapContainer.tsx
@@ -9,6 +9,7 @@ import {
   getFiltersFromHotels,
 } from "@/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils"
 import TrackingSDK from "@/components/TrackingSDK"
+import { getLang } from "@/i18n/serverContext"
 import { safeTry } from "@/utils/safeTry"
 
 import { getHotelPins } from "../../HotelCardDialogListing/utils"
@@ -33,19 +34,20 @@ function isValidHotelData(hotel: NullableHotelData): hotel is HotelData {
 
 export async function SelectHotelMapContainer({
   city,
-  searchParams,
+  selectHotelParams,
   adultsInRoom,
   childrenInRoom,
   child,
 }: SelectHotelMapContainerProps) {
+  const lang = getLang()
   const googleMapId = env.GOOGLE_DYNAMIC_MAP_ID
   const googleMapsApiKey = env.GOOGLE_STATIC_MAP_KEY
 
   const fetchAvailableHotelsPromise = safeTry(
     fetchAvailableHotels({
       cityId: city.id,
-      roomStayStartDate: searchParams.fromDate,
-      roomStayEndDate: searchParams.toDate,
+      roomStayStartDate: selectHotelParams.fromDate,
+      roomStayEndDate: selectHotelParams.toDate,
       adults: adultsInRoom,
       children: childrenInRoom,
     })
@@ -62,12 +64,12 @@ export async function SelectHotelMapContainer({
     hotel: { address: hotels?.[0]?.hotelData?.address.streetAddress },
   })
 
-  const arrivalDate = new Date(searchParams.fromDate)
-  const departureDate = new Date(searchParams.toDate)
+  const arrivalDate = new Date(selectHotelParams.fromDate)
+  const departureDate = new Date(selectHotelParams.toDate)
 
   const pageTrackingData: TrackingSDKPageData = {
     pageId: "select-hotel",
-    domainLanguage: searchParams.lang as Lang,
+    domainLanguage: lang,
     channel: TrackingChannelEnum["hotelreservation"],
     pageName: "hotelreservation|select-hotel|mapview",
     siteSections: "hotelreservation|select-hotel|mapview",
@@ -77,7 +79,7 @@ export async function SelectHotelMapContainer({
 
   const hotelsTrackingData: TrackingSDKHotelInfo = {
     availableResults: validHotels.length,
-    searchTerm: searchParams.city,
+    searchTerm: selectHotelParams.city,
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     departureDate: format(departureDate, "yyyy-MM-dd"),
     noOfAdults: adultsInRoom,
diff --git a/components/HotelReservation/SelectHotel/index.tsx b/components/HotelReservation/SelectHotel/index.tsx
index cfc37179b..85ac0b47a 100644
--- a/components/HotelReservation/SelectHotel/index.tsx
+++ b/components/HotelReservation/SelectHotel/index.tsx
@@ -20,6 +20,7 @@ import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
 import { safeTry } from "@/utils/safeTry"
+import { convertObjToSearchParams } from "@/utils/url"
 
 import HotelCardListing from "../HotelCardListing"
 import HotelCount from "./HotelCount"
@@ -46,7 +47,6 @@ export default async function SelectHotel({
 }: SelectHotelProps) {
   const {
     selectHotelParams,
-    searchParams,
     adultsInRoom,
     childrenInRoom,
     childrenInRoomArray,
@@ -57,8 +57,8 @@ export default async function SelectHotel({
   const hotelsPromise = safeTry(
     fetchAvailableHotels({
       cityId: city.id,
-      roomStayStartDate: searchParams.fromDate,
-      roomStayEndDate: searchParams.toDate,
+      roomStayStartDate: selectHotelParams.fromDate,
+      roomStayEndDate: selectHotelParams.toDate,
       adults: adultsInRoom,
       children: childrenInRoom,
     })
@@ -66,8 +66,8 @@ export default async function SelectHotel({
 
   const [hotels] = await hotelsPromise
 
-  const arrivalDate = new Date(searchParams.fromDate)
-  const departureDate = new Date(searchParams.toDate)
+  const arrivalDate = new Date(selectHotelParams.fromDate)
+  const departureDate = new Date(selectHotelParams.toDate)
 
   const isCityWithCountry = (city: any): city is { country: string } =>
     "country" in city
@@ -76,6 +76,8 @@ export default async function SelectHotel({
     hotels?.filter((hotel): hotel is HotelData => hotel !== null) || []
 
   const filterList = getFiltersFromHotels(validHotels)
+
+  const searchParams = convertObjToSearchParams(selectHotelParams)
   const breadcrumbs = [
     {
       title: intl.formatMessage({ id: "Home" }),
@@ -89,7 +91,7 @@ export default async function SelectHotel({
     },
     {
       title: intl.formatMessage({ id: "Select hotel" }),
-      href: `${selectHotel(params.lang)}/?${selectHotelParams}`,
+      href: `${selectHotel(params.lang)}/?${searchParams.toString()}`,
       uid: "select-hotel",
     },
     {
@@ -112,7 +114,7 @@ export default async function SelectHotel({
 
   const hotelsTrackingData: TrackingSDKHotelInfo = {
     availableResults: validHotels.length,
-    searchTerm: searchParams.city,
+    searchTerm: selectHotelParams.city,
     arrivalDate: format(arrivalDate, "yyyy-MM-dd"),
     departureDate: format(departureDate, "yyyy-MM-dd"),
     noOfAdults: adultsInRoom,
@@ -158,13 +160,13 @@ export default async function SelectHotel({
             >
               <div className={styles.mapContainer}>
                 <StaticMap
-                  city={searchParams.city}
+                  city={selectHotelParams.city}
                   country={isCityWithCountry(city) ? city.country : undefined}
                   width={340}
                   height={180}
                   zoomLevel={11}
                   mapType="roadmap"
-                  altText={`Map of ${searchParams.city} city center`}
+                  altText={`Map of ${selectHotelParams.city} city center`}
                 />
                 <Button wrapping size="medium" intent="text" theme="base">
                   {intl.formatMessage({ id: "See map" })}
@@ -179,12 +181,12 @@ export default async function SelectHotel({
           ) : (
             <div className={styles.mapContainer}>
               <StaticMap
-                city={searchParams.city}
+                city={selectHotelParams.city}
                 width={340}
                 height={180}
                 zoomLevel={11}
                 mapType="roadmap"
-                altText={`Map of ${searchParams.city} city center`}
+                altText={`Map of ${selectHotelParams.city} city center`}
               />
             </div>
           )}
diff --git a/components/HotelReservation/SelectRate/HotelInfoCard/NoRoomsAlert.tsx b/components/HotelReservation/SelectRate/HotelInfoCard/NoRoomsAlert.tsx
index 548e59b74..2badd5fce 100644
--- a/components/HotelReservation/SelectRate/HotelInfoCard/NoRoomsAlert.tsx
+++ b/components/HotelReservation/SelectRate/HotelInfoCard/NoRoomsAlert.tsx
@@ -5,7 +5,7 @@ import Alert from "@/components/TempDesignSystem/Alert"
 import { getIntl } from "@/i18n"
 import { safeTry } from "@/utils/safeTry"
 
-import { generateChildrenString } from "../RoomSelection/utils"
+import { generateChildrenString } from "../../utils"
 
 import styles from "./NoRoomsAlert.module.css"
 
diff --git a/components/HotelReservation/SelectRate/RoomFilter/index.tsx b/components/HotelReservation/SelectRate/RoomFilter/index.tsx
index 5e06d2cab..f1f2f26be 100644
--- a/components/HotelReservation/SelectRate/RoomFilter/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomFilter/index.tsx
@@ -8,14 +8,13 @@ import { useIntl } from "react-intl"
 import { useMediaQuery } from "usehooks-ts"
 import { z } from "zod"
 
+import { getIconForFeatureCode } from "@/components/HotelReservation/utils"
 import { InfoCircleIcon } from "@/components/Icons"
 import CheckboxChip from "@/components/TempDesignSystem/Form/FilterChip/Checkbox"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 import { Tooltip } from "@/components/TempDesignSystem/Tooltip"
 
-import { getIconForFeatureCode } from "../utils"
-
 import styles from "./roomFilter.module.css"
 
 import {
diff --git a/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx
index 51088fad3..c455dd090 100644
--- a/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx
@@ -5,13 +5,13 @@ import { useIntl } from "react-intl"
 
 import ToggleSidePeek from "@/components/HotelReservation/EnterDetails/SelectedRoom/ToggleSidePeek"
 import FlexibilityOption from "@/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption"
+import { getIconForFeatureCode } from "@/components/HotelReservation/utils"
 import { ErrorCircleIcon } from "@/components/Icons"
 import ImageGallery from "@/components/ImageGallery"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 import Footnote from "@/components/TempDesignSystem/Text/Footnote"
 import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
 
-import { getIconForFeatureCode } from "../../utils"
 import { cardVariants } from "./cardVariants"
 
 import styles from "./roomCard.module.css"
diff --git a/components/HotelReservation/SelectRate/RoomSelection/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/index.tsx
index 3a46fb1fd..c797db19e 100644
--- a/components/HotelReservation/SelectRate/RoomSelection/index.tsx
+++ b/components/HotelReservation/SelectRate/RoomSelection/index.tsx
@@ -2,9 +2,10 @@
 import { usePathname, useRouter, useSearchParams } from "next/navigation"
 import { useMemo } from "react"
 
+import { convertObjToSearchParams } from "@/utils/url"
+
 import RateSummary from "./RateSummary"
 import RoomCard from "./RoomCard"
-import { getHotelReservationQueryParams } from "./utils"
 
 import styles from "./roomSelection.module.css"
 
@@ -26,28 +27,22 @@ export default function RoomSelection({
   const { roomConfigurations, rateDefinitions } = roomsAvailability
 
   const queryParams = useMemo(() => {
-    const params = new URLSearchParams(searchParams)
-    const searchParamsObject = getHotelReservationQueryParams(searchParams)
+    // TODO: handle multiple rooms
+    const newSearchParams = convertObjToSearchParams(
+      {
+        rooms: [
+          {
+            roomTypeCode: rateSummary?.roomTypeCode,
+            rateCode: rateSummary?.public.rateCode,
+            counterRateCode: rateSummary?.member?.rateCode,
+            packages: selectedPackages,
+          },
+        ],
+      },
+      searchParams
+    )
 
-    searchParamsObject.room.forEach((item, index) => {
-      if (rateSummary?.roomTypeCode) {
-        params.set(`room[${index}].roomtype`, rateSummary.roomTypeCode)
-      }
-      if (rateSummary?.public?.rateCode) {
-        params.set(`room[${index}].ratecode`, rateSummary.public.rateCode)
-      }
-      if (rateSummary?.member?.rateCode) {
-        params.set(
-          `room[${index}].counterratecode`,
-          rateSummary.member.rateCode
-        )
-      }
-      selectedPackages.length > 0
-        ? params.set(`room[${index}].packages`, selectedPackages.join(","))
-        : params.delete(`room[${index}].packages`)
-    })
-
-    return params
+    return newSearchParams
   }, [searchParams, rateSummary, selectedPackages])
 
   function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
diff --git a/components/HotelReservation/SelectRate/RoomSelection/utils.ts b/components/HotelReservation/SelectRate/RoomSelection/utils.ts
deleted file mode 100644
index baa890a2b..000000000
--- a/components/HotelReservation/SelectRate/RoomSelection/utils.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { ChildBedTypeEnum } from "@/constants/booking"
-
-import { getFormattedUrlQueryParams } from "@/utils/url"
-
-import { ChildBedMapEnum } from "@/types/components/bookingWidget/enums"
-import type { BookingData } from "@/types/components/hotelReservation/enterDetails/bookingData"
-import type { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
-import type {
-  Child,
-  SelectRateSearchParams,
-} from "@/types/components/hotelReservation/selectRate/selectRate"
-
-export function getHotelReservationQueryParams(searchParams: URLSearchParams) {
-  return getFormattedUrlQueryParams(searchParams, {
-    adults: "number",
-    age: "number",
-    bed: ChildBedMapEnum,
-  }) as SelectRateSearchParams
-}
-
-export const bedTypeMap: Record<number, ChildBedTypeEnum> = {
-  [ChildBedMapEnum.IN_ADULTS_BED]: ChildBedTypeEnum.ParentsBed,
-  [ChildBedMapEnum.IN_CRIB]: ChildBedTypeEnum.Crib,
-  [ChildBedMapEnum.IN_EXTRA_BED]: ChildBedTypeEnum.ExtraBed,
-  [ChildBedMapEnum.UNKNOWN]: ChildBedTypeEnum.Unknown,
-}
-
-export const invertedBedTypeMap: Record<ChildBedTypeEnum, string> = {
-  [ChildBedTypeEnum.ParentsBed]: ChildBedMapEnum[ChildBedMapEnum.IN_ADULTS_BED],
-  [ChildBedTypeEnum.Crib]: ChildBedMapEnum[ChildBedMapEnum.IN_CRIB],
-  [ChildBedTypeEnum.ExtraBed]: ChildBedMapEnum[ChildBedMapEnum.IN_EXTRA_BED],
-  [ChildBedTypeEnum.Unknown]: ChildBedMapEnum[ChildBedMapEnum.UNKNOWN],
-}
-
-export function generateChildrenString(children: Child[]): string {
-  return `[${children
-    .map((child) => {
-      const age = child.age
-      const bedType = bedTypeMap[parseInt(child.bed.toString())]
-      return `${age}:${bedType}`
-    })
-    .join(",")}]`
-}
-
-export function getQueryParamsForEnterDetails(
-  searchParams: URLSearchParams
-): BookingData {
-  const selectRoomParamsObject = getHotelReservationQueryParams(searchParams)
-
-  const { room } = selectRoomParamsObject
-  return {
-    fromDate: selectRoomParamsObject.fromDate,
-    toDate: selectRoomParamsObject.toDate,
-    hotel: selectRoomParamsObject.hotel,
-    rooms: room?.map((room) => ({
-      adults: room.adults, // TODO: Handle multiple rooms
-      children: room.child, // TODO: Handle multiple rooms and children
-      roomTypeCode: room.roomtype,
-      rateCode: room.ratecode,
-      packages: room.packages?.split(",") as RoomPackageCodeEnum[],
-      counterRateCode: room.counterratecode,
-    })),
-  }
-}
-
-export function createQueryParamsForEnterDetails(
-  bookingData: BookingData,
-  intitalSearchParams: URLSearchParams
-) {
-  const { hotel, fromDate, toDate, rooms } = bookingData
-
-  const bookingSearchParams = new URLSearchParams({ hotel, fromDate, toDate })
-  const searchParams = new URLSearchParams([
-    ...intitalSearchParams,
-    ...bookingSearchParams,
-  ])
-
-  searchParams.set(`hotel`, hotel)
-
-  rooms.forEach((item, index) => {
-    if (item?.adults) {
-      searchParams.set(`room[${index}].adults`, item.adults.toString())
-    }
-    if (item?.children) {
-      item.children.forEach((child, childIndex) => {
-        searchParams.set(
-          `room[${index}].child[${childIndex}].age`,
-          child.age.toString()
-        )
-        searchParams.set(
-          `room[${index}].child[${childIndex}].bed`,
-          child.bed.toString()
-        )
-      })
-    }
-    if (item?.roomTypeCode) {
-      searchParams.set(`room[${index}].roomtype`, item.roomTypeCode)
-    }
-    if (item?.rateCode) {
-      searchParams.set(`room[${index}].ratecode`, item.rateCode)
-    }
-
-    if (item?.counterRateCode) {
-      searchParams.set(`room[${index}].counterratecode`, item.counterRateCode)
-    }
-
-    if (item.packages && item.packages.length > 0) {
-      searchParams.set(`room[${index}].packages`, item.packages.join(","))
-    }
-  })
-
-  return searchParams
-}
diff --git a/components/HotelReservation/SelectRate/Rooms/RoomsContainer.tsx b/components/HotelReservation/SelectRate/Rooms/RoomsContainer.tsx
index ea5f79a26..dc23921cb 100644
--- a/components/HotelReservation/SelectRate/Rooms/RoomsContainer.tsx
+++ b/components/HotelReservation/SelectRate/Rooms/RoomsContainer.tsx
@@ -9,7 +9,7 @@ import { auth } from "@/auth"
 import { safeTry } from "@/utils/safeTry"
 import { isValidSession } from "@/utils/session"
 
-import { generateChildrenString } from "../RoomSelection/utils"
+import { generateChildrenString } from "../../utils"
 import Rooms from "."
 
 import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
diff --git a/components/HotelReservation/SelectRate/utils.ts b/components/HotelReservation/SelectRate/utils.ts
deleted file mode 100644
index d91476bb5..000000000
--- a/components/HotelReservation/SelectRate/utils.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { AllergyIcon, PetsIcon, WheelchairIcon } from "@/components/Icons"
-
-import {
-  RoomPackageCodeEnum,
-  type RoomPackageCodes,
-} from "@/types/components/hotelReservation/selectRate/roomFilter"
-
-export function getIconForFeatureCode(featureCode: RoomPackageCodes) {
-  switch (featureCode) {
-    case RoomPackageCodeEnum.ACCESSIBILITY_ROOM:
-      return WheelchairIcon
-    case RoomPackageCodeEnum.ALLERGY_ROOM:
-      return AllergyIcon
-    case RoomPackageCodeEnum.PET_ROOM:
-      return PetsIcon
-    default:
-      return PetsIcon
-  }
-}
diff --git a/components/HotelReservation/utils.ts b/components/HotelReservation/utils.ts
new file mode 100644
index 000000000..ecfe2a5f4
--- /dev/null
+++ b/components/HotelReservation/utils.ts
@@ -0,0 +1,47 @@
+import { ChildBedTypeEnum } from "@/constants/booking"
+
+import { AllergyIcon, PetsIcon, WheelchairIcon } from "@/components/Icons"
+
+import { ChildBedMapEnum } from "@/types/components/bookingWidget/enums"
+import {
+  RoomPackageCodeEnum,
+  type RoomPackageCodes,
+} from "@/types/components/hotelReservation/selectRate/roomFilter"
+import type { Child } from "@/types/components/hotelReservation/selectRate/selectRate"
+
+export function getIconForFeatureCode(featureCode: RoomPackageCodes) {
+  switch (featureCode) {
+    case RoomPackageCodeEnum.ACCESSIBILITY_ROOM:
+      return WheelchairIcon
+    case RoomPackageCodeEnum.ALLERGY_ROOM:
+      return AllergyIcon
+    case RoomPackageCodeEnum.PET_ROOM:
+      return PetsIcon
+    default:
+      return PetsIcon
+  }
+}
+
+export const bedTypeMap: Record<number, ChildBedTypeEnum> = {
+  [ChildBedMapEnum.IN_ADULTS_BED]: ChildBedTypeEnum.ParentsBed,
+  [ChildBedMapEnum.IN_CRIB]: ChildBedTypeEnum.Crib,
+  [ChildBedMapEnum.IN_EXTRA_BED]: ChildBedTypeEnum.ExtraBed,
+  [ChildBedMapEnum.UNKNOWN]: ChildBedTypeEnum.Unknown,
+}
+
+export const invertedBedTypeMap: Record<ChildBedTypeEnum, string> = {
+  [ChildBedTypeEnum.ParentsBed]: ChildBedMapEnum[ChildBedMapEnum.IN_ADULTS_BED],
+  [ChildBedTypeEnum.Crib]: ChildBedMapEnum[ChildBedMapEnum.IN_CRIB],
+  [ChildBedTypeEnum.ExtraBed]: ChildBedMapEnum[ChildBedMapEnum.IN_EXTRA_BED],
+  [ChildBedTypeEnum.Unknown]: ChildBedMapEnum[ChildBedMapEnum.UNKNOWN],
+}
+
+export function generateChildrenString(children: Child[]): string {
+  return `[${children
+    .map((child) => {
+      const age = child.age
+      const bedType = bedTypeMap[parseInt(child.bed.toString())]
+      return `${age}:${bedType}`
+    })
+    .join(",")}]`
+}
diff --git a/middlewares/dateFormat.ts b/middlewares/dateFormat.ts
index 8eda2e011..fc9ab045d 100644
--- a/middlewares/dateFormat.ts
+++ b/middlewares/dateFormat.ts
@@ -23,14 +23,14 @@ export const middleware: NextMiddleware = (request) => {
   const { searchParams } = url
 
   if (
-    legacyDatePattern.test(searchParams.get("fromDate")!) ||
-    legacyDatePattern.test(searchParams.get("toDate")!)
+    legacyDatePattern.test(searchParams.get("fromdate")!) ||
+    legacyDatePattern.test(searchParams.get("todate")!)
   ) {
-    const fromDate = searchParams.get("fromDate")!
-    url.searchParams.set("fromDate", normalizeDate(fromDate))
+    const fromDate = searchParams.get("fromdate")!
+    url.searchParams.set("fromdate", normalizeDate(fromDate))
 
-    const toDate = searchParams.get("toDate")!
-    url.searchParams.set("toDate", normalizeDate(toDate))
+    const toDate = searchParams.get("todate")!
+    url.searchParams.set("todate", normalizeDate(toDate))
     return NextResponse.redirect(url)
   } else {
     const headers = new Headers(request.headers)
@@ -43,5 +43,5 @@ export const middleware: NextMiddleware = (request) => {
 
 export const matcher: MiddlewareMatcher = (request) => {
   const { searchParams } = request.nextUrl
-  return searchParams.has("fromDate") || searchParams.has("toDate")
+  return searchParams.has("fromdate") || searchParams.has("todate")
 }
diff --git a/next.config.js b/next.config.js
index 54d74ae41..cad1e8cb1 100644
--- a/next.config.js
+++ b/next.config.js
@@ -112,14 +112,14 @@ const nextConfig = {
       },
       {
         // ----------------------------------------
-        // fromDate param missing
+        // fromdate param missing
         // ----------------------------------------
         source:
           "/:lang/hotelreservation/(select-bed|breakfast|details|payment)",
         destination: "/:lang/hotelreservation/select-rate",
         missing: [
           {
-            key: "fromDate",
+            key: "fromdate",
             type: "query",
             value: undefined,
           },
@@ -128,14 +128,14 @@ const nextConfig = {
       },
       {
         // ----------------------------------------
-        // fromDate param has to be a date
+        // fromdate param has to be a date
         // ----------------------------------------
         source:
           "/:lang/hotelreservation/(select-bed|breakfast|details|payment)",
         destination: "/:lang/hotelreservation/select-rate",
         missing: [
           {
-            key: "fromDate",
+            key: "fromdate",
             type: "query",
             value: "^([12]\\d{3}-(0[1-9]|1[0-2])-(0?[1-9]|[12]\\d|3[01]))$",
           },
@@ -144,14 +144,14 @@ const nextConfig = {
       },
       {
         // ----------------------------------------
-        // toDate param missing
+        // todate param missing
         // ----------------------------------------
         source:
           "/:lang/hotelreservation/(select-bed|breakfast|details|payment)",
         destination: "/:lang/hotelreservation/select-rate",
         missing: [
           {
-            key: "toDate",
+            key: "todate",
             type: "query",
             value: undefined,
           },
@@ -160,14 +160,14 @@ const nextConfig = {
       },
       {
         // ----------------------------------------
-        // toDate param has to be a date
+        // todate param has to be a date
         // ----------------------------------------
         source:
           "/:lang/hotelreservation/(select-bed|breakfast|details|payment)",
         destination: "/:lang/hotelreservation/select-rate",
         missing: [
           {
-            key: "toDate",
+            key: "todate",
             type: "query",
             value: "^([12]\\d{3}-(0[1-9]|1[0-2])-(0?[1-9]|[12]\\d|3[01]))$",
           },
diff --git a/stores/enter-details/helpers.ts b/stores/enter-details/helpers.ts
index 62254cc32..58eeb1b90 100644
--- a/stores/enter-details/helpers.ts
+++ b/stores/enter-details/helpers.ts
@@ -8,15 +8,13 @@ import { arrayMerge } from "@/utils/merge"
 
 import { detailsStorageName } from "."
 
-import type { BookingData } from "@/types/components/hotelReservation/enterDetails/bookingData"
+import type { SelectRateSearchParams } from "@/types/components/hotelReservation/selectRate/selectRate"
 import { CurrencyEnum } from "@/types/enums/currency"
 import type { StepEnum } from "@/types/enums/step"
 import type {
   DetailsState,
   PersistedState,
   PersistedStatePart,
-  Price,
-  RoomPrice,
   RoomRate,
 } from "@/types/stores/enter-details"
 import type { SafeUser } from "@/types/user"
@@ -55,7 +53,10 @@ export function navigate(step: StepEnum, searchParams: string) {
   window.history.pushState({ step }, "", `${step}?${searchParams}`)
 }
 
-export function checkIsSameRoom(prev: BookingData, next: BookingData) {
+export function checkIsSameRoom(
+  prev: SelectRateSearchParams,
+  next: SelectRateSearchParams
+) {
   const { rooms: prevRooms, ...prevBooking } = prev
 
   const prevRoomsWithoutRateCodes = prevRooms.map(
diff --git a/stores/enter-details/useEnterDetailsStore.test.tsx b/stores/enter-details/useEnterDetailsStore.test.tsx
index 8b57e270f..29d8bc2da 100644
--- a/stores/enter-details/useEnterDetailsStore.test.tsx
+++ b/stores/enter-details/useEnterDetailsStore.test.tsx
@@ -29,7 +29,7 @@ jest.mock("@/lib/api", () => ({
 }))
 
 const booking = {
-  hotel: "123",
+  hotelId: "123",
   fromDate: "2100-01-01",
   toDate: "2100-01-02",
   rooms: [
diff --git a/types/components/bookingWidget/guestsRoomsPicker.ts b/types/components/bookingWidget/guestsRoomsPicker.ts
index b672df7ea..0adbe970b 100644
--- a/types/components/bookingWidget/guestsRoomsPicker.ts
+++ b/types/components/bookingWidget/guestsRoomsPicker.ts
@@ -1,17 +1,11 @@
+import type { Child, Room } from "../hotelReservation/selectRate/selectRate"
+
 export type ChildBed = {
   label: string
   value: number
 }
 
-export type Child = {
-  age: number
-  bed: number
-}
-
-export type TGuestsRoom = {
-  adults: number
-  child: Child[]
-}
+export type TGuestsRoom = Required<Pick<Room, "adults" | "children">>
 
 export type GuestsRoomPickerProps = {
   index: number
diff --git a/types/components/bookingWidget/index.ts b/types/components/bookingWidget/index.ts
index e8eda85c8..be1c0d0d2 100644
--- a/types/components/bookingWidget/index.ts
+++ b/types/components/bookingWidget/index.ts
@@ -1,6 +1,7 @@
 import type { VariantProps } from "class-variance-authority"
 import type { z } from "zod"
 
+import type { SearchParams } from "@/types/params"
 import type { Locations } from "@/types/trpc/routers/hotel/locations"
 import type { bookingWidgetSchema } from "@/components/Forms/BookingWidget/schema"
 import type { bookingWidgetVariants } from "@/components/Forms/BookingWidget/variants"
@@ -8,12 +9,12 @@ import type { TGuestsRoom } from "./guestsRoomsPicker"
 
 export type BookingWidgetSchema = z.output<typeof bookingWidgetSchema>
 
-export type BookingWidgetSearchParams = {
+export type BookingWidgetSearchData = {
   city?: string
   hotel?: string
   fromDate?: string
   toDate?: string
-  room?: TGuestsRoom[]
+  rooms?: TGuestsRoom[]
 }
 
 export type BookingWidgetType = VariantProps<
@@ -22,13 +23,13 @@ export type BookingWidgetType = VariantProps<
 
 export interface BookingWidgetProps {
   type?: BookingWidgetType
-  searchParams?: URLSearchParams
+  bookingWidgetSearchParams: SearchParams<BookingWidgetSearchData>["searchParams"]
 }
 
 export interface BookingWidgetClientProps {
   locations: Locations
   type?: BookingWidgetType
-  searchParams?: URLSearchParams
+  bookingWidgetSearchParams: SearchParams<BookingWidgetSearchData>["searchParams"]
 }
 
 export interface BookingWidgetToggleButtonProps {
diff --git a/types/components/hotelReservation/enterDetails/bookingData.ts b/types/components/hotelReservation/enterDetails/bookingData.ts
deleted file mode 100644
index 12760e765..000000000
--- a/types/components/hotelReservation/enterDetails/bookingData.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { RoomPackageCodeEnum } from "../selectRate/roomFilter"
-import type { Child } from "../selectRate/selectRate"
-
-interface Room {
-  adults: number
-  roomTypeCode: string
-  rateCode: string
-  counterRateCode?: string
-  children?: Child[]
-  packages?: RoomPackageCodeEnum[]
-}
-export interface BookingData {
-  hotel: string
-  fromDate: string
-  toDate: string
-  rooms: Room[]
-}
diff --git a/types/components/hotelReservation/selectHotel/map.ts b/types/components/hotelReservation/selectHotel/map.ts
index ae70cb3e7..8270742da 100644
--- a/types/components/hotelReservation/selectHotel/map.ts
+++ b/types/components/hotelReservation/selectHotel/map.ts
@@ -3,7 +3,7 @@ import type { z } from "zod"
 import type { Coordinates } from "@/types/components/maps/coordinates"
 import type { Location } from "@/types/trpc/routers/hotel/locations"
 import type { imageSchema } from "@/server/routers/hotels/schemas/image"
-import type { Child } from "../../bookingWidget/guestsRoomsPicker"
+import type { Child } from "../selectRate/selectRate"
 import type { HotelData } from "./hotelCardListingProps"
 import type { CategorizedFilters, Filter } from "./hotelFilters"
 import type { SelectHotelSearchParams } from "./selectHotelSearchParams"
@@ -66,7 +66,7 @@ export interface HotelCardDialogListingProps {
 
 export type SelectHotelMapContainerProps = {
   city: Location
-  searchParams: SelectHotelSearchParams
+  selectHotelParams: SelectHotelSearchParams
   adultsInRoom: number
   childrenInRoom: string | undefined
   child: Child[] | undefined
diff --git a/types/components/hotelReservation/selectHotel/selectHotel.ts b/types/components/hotelReservation/selectHotel/selectHotel.ts
index f01e5e7ea..be91fb92e 100644
--- a/types/components/hotelReservation/selectHotel/selectHotel.ts
+++ b/types/components/hotelReservation/selectHotel/selectHotel.ts
@@ -46,8 +46,7 @@ export interface SelectHotelProps {
     lang: Lang
   }
   reservationParams: {
-    selectHotelParams: URLSearchParams | undefined
-    searchParams: SelectHotelSearchParams
+    selectHotelParams: SelectHotelSearchParams
     adultsInRoom: number
     childrenInRoom: string | undefined
     childrenInRoomArray: Child[] | undefined
diff --git a/types/components/hotelReservation/selectHotel/selectHotelSearchParams.ts b/types/components/hotelReservation/selectHotel/selectHotelSearchParams.ts
index 30004346a..b269cfaf7 100644
--- a/types/components/hotelReservation/selectHotel/selectHotelSearchParams.ts
+++ b/types/components/hotelReservation/selectHotel/selectHotelSearchParams.ts
@@ -1,17 +1,9 @@
-interface Child {
-  bed: string
-  age: number
-}
-
-interface Room {
-  adults: number
-  child?: Child[]
-}
+import type { Room } from "../selectRate/selectRate"
 
 export interface SelectHotelSearchParams {
   city: string
   fromDate: string
   toDate: string
-  room: Room[]
-  [key: string]: string | string[] | Room[]
+  rooms: Pick<Room, "adults" | "children">[]
+  [key: string]: string | string[] | Pick<Room, "adults" | "children">[]
 }
diff --git a/types/components/hotelReservation/selectRate/selectRate.ts b/types/components/hotelReservation/selectRate/selectRate.ts
index b7f65b8ff..0cbb46080 100644
--- a/types/components/hotelReservation/selectRate/selectRate.ts
+++ b/types/components/hotelReservation/selectRate/selectRate.ts
@@ -1,26 +1,27 @@
 import type { Product, RoomConfiguration } from "@/server/routers/hotels/output"
 import type { ChildBedMapEnum } from "../../bookingWidget/enums"
+import type { RoomPackageCodeEnum } from "./roomFilter"
 
 export interface Child {
   bed: ChildBedMapEnum
   age: number
 }
 
-interface Room {
+export interface Room {
   adults: number
-  roomtype: string
-  ratecode: string
-  counterratecode: string
-  child?: Child[]
-  packages?: string
+  roomTypeCode: string
+  rateCode: string
+  counterRateCode: string
+  children?: Child[]
+  packages?: RoomPackageCodeEnum[]
 }
 
 export interface SelectRateSearchParams {
-  hotel: string
+  city?: string
+  hotelId: string
   fromDate: string
   toDate: string
-  room: Room[]
-  [key: string]: string | string[] | Room[]
+  rooms: Room[]
 }
 
 export interface Rate {
diff --git a/types/providers/enter-details.ts b/types/providers/enter-details.ts
index 0659d77ed..05db0ee74 100644
--- a/types/providers/enter-details.ts
+++ b/types/providers/enter-details.ts
@@ -1,13 +1,12 @@
 import type { BedTypeSelection } from "@/types/components/hotelReservation/enterDetails/bedType"
-import type { BookingData } from "@/types/components/hotelReservation/enterDetails/bookingData"
-import type { BreakfastPackage } from "@/types/components/hotelReservation/enterDetails/breakfast"
 import type { StepEnum } from "@/types/enums/step"
 import type { RoomAvailability } from "@/types/trpc/routers/hotel/availability"
 import type { SafeUser } from "@/types/user"
+import type { SelectRateSearchParams } from "../components/hotelReservation/selectRate/selectRate"
 import type { Packages } from "../requests/packages"
 
 export interface DetailsProviderProps extends React.PropsWithChildren {
-  booking: BookingData
+  booking: SelectRateSearchParams
   bedTypes: BedTypeSelection[]
   showBreakfastStep: boolean
   packages: Packages | null
diff --git a/types/stores/enter-details.ts b/types/stores/enter-details.ts
index 1a2270f16..3d35afa57 100644
--- a/types/stores/enter-details.ts
+++ b/types/stores/enter-details.ts
@@ -1,11 +1,11 @@
 import type { BedTypeSchema } from "@/types/components/hotelReservation/enterDetails/bedType"
-import type { BookingData } from "@/types/components/hotelReservation/enterDetails/bookingData"
 import type { BreakfastPackage } from "@/types/components/hotelReservation/enterDetails/breakfast"
 import type {
   DetailsSchema,
   SignedInDetailsSchema,
 } from "@/types/components/hotelReservation/enterDetails/details"
 import type { StepEnum } from "@/types/enums/step"
+import type { SelectRateSearchParams } from "../components/hotelReservation/selectRate/selectRate"
 import type { DetailsProviderProps } from "../providers/enter-details"
 import type { Packages } from "../requests/packages"
 
@@ -26,7 +26,7 @@ export interface Price {
 
 export interface FormValues {
   bedType: BedTypeSchema | undefined
-  booking: BookingData
+  booking: SelectRateSearchParams
   breakfast: BreakfastPackage | false | undefined
   guest: DetailsSchema | SignedInDetailsSchema
 }
@@ -46,7 +46,7 @@ export interface DetailsState {
     updateSeachParamString: (searchParamString: string) => void
   }
   bedType: BedTypeSchema | undefined
-  booking: BookingData
+  booking: SelectRateSearchParams
   breakfast: BreakfastPackage | false | undefined
   currentStep: StepEnum
   formValues: FormValues
diff --git a/utils/url.ts b/utils/url.ts
index 4366fa181..1f3c540a1 100644
--- a/utils/url.ts
+++ b/utils/url.ts
@@ -1,3 +1,9 @@
+import type { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
+import type {
+  Child,
+  Room,
+} from "@/types/components/hotelReservation/selectRate/selectRate"
+
 export function removeMultipleSlashes(pathname: string) {
   return pathname.replaceAll(/\/\/+/g, "/")
 }
@@ -10,35 +16,142 @@ export function removeTrailingSlash(pathname: string) {
   return pathname
 }
 
-export function getFormattedUrlQueryParams(
-  searchParams: URLSearchParams,
-  dataTypes: Record<string, unknown>
+type PartialRoom = { rooms?: Partial<Room>[] }
+
+const keyedSearchParams = new Map([
+  ["room", "rooms"],
+  ["ratecode", "rateCode"],
+  ["counterratecode", "counterRateCode"],
+  ["roomtype", "roomTypeCode"],
+  ["fromdate", "fromDate"],
+  ["todate", "toDate"],
+  ["hotel", "hotelId"],
+  ["child", "children"],
+])
+
+export function getKeyFromSearchParam(key: string): string {
+  return keyedSearchParams.get(key) || key
+}
+
+export function getSearchParamFromKey(key: string): string {
+  for (const [mapKey, mapValue] of keyedSearchParams.entries()) {
+    if (mapValue === key) {
+      return mapKey
+    }
+  }
+  return key
+}
+
+export function convertSearchParamsToObj<T extends PartialRoom>(
+  searchParams: Record<string, string>
 ) {
-  const searchParamsObject: Record<string, unknown> = Array.from(
-    searchParams.entries()
-  ).reduce<Record<string, unknown>>(
-    (acc, [key, value]) => {
-      const keys = key.replace(/\]/g, "").split(/\[|\./) // Split keys by '[' or '.'
-      keys.reduce((nestedAcc, k, i) => {
-        if (i === keys.length - 1) {
-          if (dataTypes[k] == "number") {
-            ;(nestedAcc as Record<string, unknown>)[k] = Number(value)
-          } else if (dataTypes[k] == "boolean") {
-            ;(nestedAcc as Record<string, unknown>)[k] =
-              value.toLowerCase() === "true"
-          } else {
-            ;(nestedAcc as Record<string, unknown>)[k] = value
-          }
-        } else {
-          if (!nestedAcc[k]) {
-            nestedAcc[k] = isNaN(Number(keys[i + 1])) ? {} : [] // Initialize as object or array
-          }
+  const searchParamsObject = Object.entries(searchParams).reduce<
+    T & PartialRoom
+  >((acc, [key, value]) => {
+    // The params are sometimes indexed with a number (for ex: `room[0].adults`),
+    // so we need to split them by . or []
+    const keys = key.replace(/\]/g, "").split(/\[|\./)
+    const firstKey = getKeyFromSearchParam(keys[0]) as keyof T
+
+    // Room is a special case since it is an array, so we need to handle it separately
+    if (firstKey === "rooms") {
+      // Rooms are always indexed with a number, so we need to extract the index
+      const index = Number(keys[1])
+      const roomObject =
+        acc.rooms && Array.isArray(acc.rooms) ? acc.rooms : (acc.rooms = [])
+
+      const roomObjectKey = getKeyFromSearchParam(keys[2]) as keyof Room
+
+      if (!roomObject[index]) {
+        roomObject[index] = {}
+      }
+
+      // Adults should be converted to a number
+      if (roomObjectKey === "adults") {
+        roomObject[index].adults = Number(value)
+
+        // Child is an array, so we need to handle it separately
+      } else if (roomObjectKey === "children") {
+        const childIndex = Number(keys[3])
+        const childKey = keys[4] as keyof Child
+
+        if (
+          !("children" in roomObject[index]) ||
+          !Array.isArray(roomObject[index].children)
+        ) {
+          roomObject[index].children = []
         }
-        return nestedAcc[k] as Record<string, unknown>
-      }, acc)
-      return acc
-    },
-    {} as Record<string, unknown>
-  )
+
+        roomObject[index].children![childIndex] = {
+          ...roomObject[index].children![childIndex],
+          [childKey]: Number(value),
+        }
+      } else if (roomObjectKey === "packages") {
+        roomObject[index].packages = value.split(",") as RoomPackageCodeEnum[]
+      } else {
+        roomObject[index][roomObjectKey] = value
+      }
+    } else {
+      acc[firstKey] = value as T[keyof T]
+    }
+
+    return acc
+  }, {} as T)
+
   return searchParamsObject
 }
+
+export function convertObjToSearchParams<T>(
+  bookingData: T & PartialRoom,
+  intitalSearchParams = {} as URLSearchParams
+) {
+  const bookingSearchParams = new URLSearchParams(intitalSearchParams)
+  Object.entries(bookingData).forEach(([key, value]) => {
+    if (key === "rooms") {
+      value.forEach((item, index) => {
+        if (item?.adults) {
+          bookingSearchParams.set(
+            `room[${index}].adults`,
+            item.adults.toString()
+          )
+        }
+        if (item?.children) {
+          item.children.forEach((child, childIndex) => {
+            bookingSearchParams.set(
+              `room[${index}].child[${childIndex}].age`,
+              child.age.toString()
+            )
+            bookingSearchParams.set(
+              `room[${index}].child[${childIndex}].bed`,
+              child.bed.toString()
+            )
+          })
+        }
+        if (item?.roomTypeCode) {
+          bookingSearchParams.set(`room[${index}].roomtype`, item.roomTypeCode)
+        }
+        if (item?.rateCode) {
+          bookingSearchParams.set(`room[${index}].ratecode`, item.rateCode)
+        }
+
+        if (item?.counterRateCode) {
+          bookingSearchParams.set(
+            `room[${index}].counterratecode`,
+            item.counterRateCode
+          )
+        }
+
+        if (item.packages && item.packages.length > 0) {
+          bookingSearchParams.set(
+            `room[${index}].packages`,
+            item.packages.join(",")
+          )
+        }
+      })
+    } else {
+      bookingSearchParams.set(getSearchParamFromKey(key), value.toString())
+    }
+  })
+
+  return bookingSearchParams
+}