diff --git a/sge-frontend/src/views/DataInput.js b/sge-frontend/src/views/DataInput.js
index 9256376..78458bf 100644
--- a/sge-frontend/src/views/DataInput.js
+++ b/sge-frontend/src/views/DataInput.js
@@ -71,16 +71,16 @@ const DataInput = () => {
         const areaOptions = dc.area.tag
           ? [{ value: dc.area.tag, label: dc.area.tag, type: "area" }]
           : [];
-        // City options from cityNames array
-        const cityOptions = (dc.area.cityNames || []).map((cityName) => ({
-          value: cityName,
-          label: cityName,
+        // City options from cities array
+        const cityOptions = (dc.area.cities || []).map((city) => ({
+          value: city.name,
+          label: city.name,
           type: "city",
         }));
-        // District options from districtNames array
-        const districtOptions = (dc.area.districtNames || []).map((districtName) => ({
-          value: districtName,
-          label: districtName,
+        // District options from districts array
+        const districtOptions = (dc.area.districts || []).map((district) => ({
+          value: district.name,
+          label: district.name,
           type: "district",
         }));
         setAreasOptions([...areaOptions, ...cityOptions, ...districtOptions]);
diff --git a/sge-frontend/src/views/Map.js b/sge-frontend/src/views/Map.js
index 34ac979..c044980 100644
--- a/sge-frontend/src/views/Map.js
+++ b/sge-frontend/src/views/Map.js
@@ -634,7 +634,7 @@ const Map = () => {
                   <h5 className="mb-2">{dc.dataCenter}</h5>
                   <p className="mb-1"><strong>{t('DataCenter.number')}:</strong> {dc.number}</p>
                   <p className="mb-1"><strong>{t('DataCenter.externalId')}:</strong> {dc.externalId}</p>
-                  <p className="mb-1"><strong>{t('DataCenter.city')}:</strong> {dc.area?.cityNames || "-"}</p>
+                  <p className="mb-1"><strong>{t('DataCenter.city')}:</strong> {dc.area?.cities?.map(city => city.name).join(', ') || "-"}</p>
                   {dc.area && <p className="mb-1"><strong>{t('Area')}:</strong> {dc.area.tag}</p>}
                   {dc.projects?.length > 0 && (
                     <p className="mb-1">