diff --git a/src/datasources/interior-api.ts b/src/datasources/interior-api.ts
index 716358c..6894033 100644
--- a/src/datasources/interior-api.ts
+++ b/src/datasources/interior-api.ts
@@ -3,7 +3,7 @@ import {
   InteriorsFilter,
   InteriorType,
 } from '../types/interior-types';
-import { Orientation, ProductGroup } from '../types/product-types';
+import { Orientation } from '../types/product-types';
 import { Maybe } from '../types/types';
 import { BaseSQLDataSource } from './BaseSQLDataSource';
 import { ImageServerApi } from './imageserver-api';
@@ -18,22 +18,18 @@ export class InteriorAPI extends BaseSQLDataSource {
     this.imageServerApi = imageServerApi;
   }
 
-  getInteriorType(productGroup: ProductGroup): string {
-    switch (productGroup) {
-      case ProductGroup.DESIGNER_WALLPAPER:
-      case ProductGroup.WALLPAPER:
-      case ProductGroup.PHOTO_WALLPAPER:
+  getInteriorType(roomTypePart: string): string {
+    switch (roomTypePart) {
+      case 'wallpaper':
         return InteriorType[InteriorType.WALLPAPER];
-      case ProductGroup.CANVAS:
+      case 'painting':
         return InteriorType[InteriorType.PAINTING];
-      case ProductGroup.POSTER:
+      case 'poster':
         return InteriorType[InteriorType.POSTER];
-      case ProductGroup.FRAMED_PRINT:
+      case 'framed-print':
         return InteriorType[InteriorType.FRAMED_PRINT];
       default:
-        throw new Error(
-          `Could not define interior type from product group [${productGroup}]`,
-        );
+        throw new Error(`Unknown room type: ${roomTypePart}`);
     }
   }
 
@@ -55,12 +51,13 @@ export class InteriorAPI extends BaseSQLDataSource {
   }
 
   decorateRow(row: any): Interior {
+    console.log('row', row);
     if (row.roomName) {
       const parts = row.roomName.split('_');
       row.roomNumber = this.getInteriorRoomNumber(parts[0]);
+      row.type = this.getInteriorType(parts[1]);
       row.orientation = this.getInteriorOrientation(parts[2]);
     }
-    row.type = this.getInteriorType(row.productGroup);
     return row;
   }
 
@@ -78,6 +75,7 @@ export class InteriorAPI extends BaseSQLDataSource {
             ...row,
             roomName: row.name,
             roomType: row.roomtype,
+            id: row.s3_suffix,
           };
           this.decorateRow(res);
           return res;
@@ -118,7 +116,7 @@ export class InteriorAPI extends BaseSQLDataSource {
         return rows.map((row) => {
           const res = {
             ...row,
-            id: row.interiorId,
+            id: row.uri,
           };
           this.decorateRow(res);
           return res;