diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/@modal/(.)map/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/@modal/(.)map/page.tsx
index 40ce894bc..600afbb38 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/@modal/(.)map/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/@modal/(.)map/page.tsx
@@ -14,7 +14,7 @@ import { setLang } from "@/i18n/serverContext"
 
 import { fetchAvailableHotels, getFiltersFromHotels } from "../../utils"
 
-import { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
+import type { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
 import type { SelectHotelSearchParams } from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
 import type { LangParams, PageArgs } from "@/types/params"
 
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 ec281141b..d0b079f5d 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
@@ -33,7 +33,7 @@ import { setLang } from "@/i18n/serverContext"
 
 import styles from "./page.module.css"
 
-import { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
+import type { HotelData } from "@/types/components/hotelReservation/selectHotel/hotelCardListingProps"
 import type { SelectHotelSearchParams } from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
 import { AlertTypeEnum } from "@/types/enums/alert"
 import { LangParams, PageArgs } from "@/types/params"
@@ -112,6 +112,8 @@ export default async function SelectHotelPage({
 
   const isAllUnavailable = hotels.every((hotel) => hotel.price === undefined)
 
+  console.log("searchParams.city", searchParams.city)
+
   return (
     <>
       <header className={styles.header}>
diff --git a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts
index fe9f0ab84..7960d3314 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts
+++ b/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/utils.ts
@@ -1,6 +1,5 @@
 import { getHotelData } from "@/lib/trpc/memoizedRequests"
 import { serverClient } from "@/lib/trpc/server"
-import { badRequestError } from "@/server/errors/trpc"
 
 import { getLang } from "@/i18n/serverContext"
 
diff --git a/components/HotelReservation/HotelCardDialogListing/index.tsx b/components/HotelReservation/HotelCardDialogListing/index.tsx
index 7e8750ec2..4f9e83b36 100644
--- a/components/HotelReservation/HotelCardDialogListing/index.tsx
+++ b/components/HotelReservation/HotelCardDialogListing/index.tsx
@@ -77,7 +77,7 @@ export default function HotelCardDialogListing({
 
   return (
     <div className={styles.hotelCardDialogListing} ref={dialogRef}>
-      {hotelsPinData?.length &&
+      {!!hotelsPinData?.length &&
         hotelsPinData.map((data) => {
           const isActive = data.name === activeCard
           return (
diff --git a/components/Maps/StaticMap/index.tsx b/components/Maps/StaticMap/index.tsx
index 7c80aa01f..6db5eada3 100644
--- a/components/Maps/StaticMap/index.tsx
+++ b/components/Maps/StaticMap/index.tsx
@@ -5,6 +5,25 @@ import { getUrlWithSignature } from "@/utils/map"
 
 import { StaticMapProps } from "@/types/components/maps/staticMap"
 
+function getCenter({
+  coordinates,
+  city,
+  country,
+}: {
+  coordinates?: { lat: number; lng: number }
+  city?: string
+  country?: string
+}): string | undefined {
+  switch (true) {
+    case !!coordinates:
+      return `${coordinates.lat},${coordinates.lng}`
+    case !!country:
+      return `${city}, ${country}`
+    default:
+      return city
+  }
+}
+
 export default function StaticMap({
   city,
   country,
@@ -19,9 +38,7 @@ export default function StaticMap({
   const key = env.GOOGLE_STATIC_MAP_KEY
   const secret = env.GOOGLE_STATIC_MAP_SIGNATURE_SECRET
   const baseUrl = "https://maps.googleapis.com/maps/api/staticmap"
-  const center = coordinates
-    ? `${coordinates.lat},${coordinates.lng}`
-    : `${city}, ${country}`
+  const center = getCenter({ coordinates, city, country })
 
   if (!center) {
     return null