diff --git a/src/services/dataService.ts b/src/services/dataService.ts
index 6706324..a2cee3d 100644
--- a/src/services/dataService.ts
+++ b/src/services/dataService.ts
@@ -182,13 +182,13 @@ async function fetchFromNocoDB(): Promise<MuseumRecord[]> {
     museumMap[m.Id] = {
       code: m.Code,
       name: m.Name,
-      district: districtMap[m['nc_epk____Districts_id']] || 'Unknown'
+      district: districtMap[m.DistrictId || m['nc_epk____Districts_id']] || 'Unknown'
     };
   });
   
   // Join data into flat structure
   const data: MuseumRecord[] = dailyStats.map(row => {
-    const museum = museumMap[row['nc_epk____Museums_id']] || { code: '', name: '', district: '' };
+    const museum = museumMap[row.MuseumId || row['nc_epk____Museums_id']] || { code: '', name: '', district: '' };
     const date = row.Date;
     const year = date ? date.substring(0, 4) : '';
     const month = date ? parseInt(date.substring(5, 7)) : 0;
diff --git a/src/types/index.ts b/src/types/index.ts
index 6267c90..21e4611 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -149,7 +149,8 @@ export interface NocoDBMuseum {
   Id: number;
   Code: string;
   Name: string;
-  'nc_epk____Districts_id': number;
+  DistrictId?: number;
+  'nc_epk____Districts_id'?: number;
 }
 
 export interface NocoDBDailyStat {
@@ -159,7 +160,8 @@ export interface NocoDBDailyStat {
   Tickets: number;
   GrossRevenue: number;
   NetRevenue: number;
-  'nc_epk____Museums_id': number;
+  MuseumId?: number;
+  'nc_epk____Museums_id'?: number;
 }
 
 // Translation function type