diff --git a/components/home/FrequentSearches.js b/components/home/FrequentSearches.js
index c81f6ef..d73b153 100644
--- a/components/home/FrequentSearches.js
+++ b/components/home/FrequentSearches.js
@@ -14,6 +14,7 @@ function FrequentSearches() {
         <ul className="flex items-center justify-start gap-[14px] pl-[14px]">
           {childrenList.map((item, idx) => (
             <Link
+              key={item.id || idx}
               href={{
                 pathname: "/doctors",
                 query: {
@@ -21,7 +22,7 @@ function FrequentSearches() {
                 },
               }}
             >
-              <li key={idx}>
+              <li>
                 <Button
                   variant="contained"
                   color="secondary"
diff --git a/components/home/TextHeader.js b/components/home/TextHeader.js
index eb31f63..131709b 100644
--- a/components/home/TextHeader.js
+++ b/components/home/TextHeader.js
@@ -2,8 +2,8 @@ import { getStateInfo } from "@/lib/getStateInfo";
 import AText from "../icons/AText";
 import BText from "../icons/BText";
 
-function TextHeader() {
-  const { matchedCity } = getStateInfo();
+async function TextHeader() {
+  const { matchedCity } = await getStateInfo();
 
   return (
     <div className="z-[50]">
diff --git a/lib/getStateInfo.js b/lib/getStateInfo.js
index edf49c3..ddb6de6 100644
--- a/lib/getStateInfo.js
+++ b/lib/getStateInfo.js
@@ -6,12 +6,16 @@ import statesData from "@/data/state.json";
 
 export async function getStateInfo() {
   const headersList = await headers();
+
   const host = headersList.get("host") || "";
   const subdomain = host.split(".")[0];
 
-  const matchedCity = citiesData.find((city) =>
-    city.domain.includes(subdomain),
-  );
+  // Match city by domain (supports both full domain and subdomain)
+  const matchedCity = citiesData.find((city) => {
+    const cityDomain = city.domain.split(".")[0]; // Extract subdomain from domain (e.g., "yasuj-nobat" from "yasuj-nobat.ir")
+    return cityDomain === subdomain;
+  });
+
   const matchedState =
     matchedCity &&
     statesData.find((state) => state.id === matchedCity.province_id);