diff --git a/libs/common/src/util/buildTypeORMIncludeQuery.ts b/libs/common/src/util/buildTypeORMIncludeQuery.ts
index bffd5be..a8d4e20 100644
--- a/libs/common/src/util/buildTypeORMIncludeQuery.ts
+++ b/libs/common/src/util/buildTypeORMIncludeQuery.ts
@@ -21,16 +21,14 @@ const mappingInclude: { [key: string]: any } = {
   },
   'space-model': {
     subspaceModels: 'subspace-model',
-    spaceProductModels: 'space-product-model',
+    tags: 'tag_model',
   },
   'subspace-model': {
-    productModels: 'subspace-product-model',
+    tags: 'tag_model',
   },
-  'subspace-product-model': {
-    itemModels: true,
-  },
-  'space-product-model': {
-    items: true,
+  tag_model: {
+    tag_model: true,
+    product: true,
   },
 };
 
diff --git a/src/space-model/services/space-model.service.ts b/src/space-model/services/space-model.service.ts
index 89e9edb..747ea39 100644
--- a/src/space-model/services/space-model.service.ts
+++ b/src/space-model/services/space-model.service.ts
@@ -113,7 +113,7 @@ export class SpaceModelService {
       pageable.where = {
         project: { uuid: param.projectUuid },
       };
-      pageable.include = 'subspaceModels,tags,subspaceModels.tags';
+      pageable.include = 'subspaceModels,tags,subspaceModels.tags,tags.product,subspaceModels.tags.product';
 
       const customModel = TypeORMCustomModel(this.spaceModelRepository);