diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
index db6bb52701..4b7eb8524d 100644
--- a/server/src/services/app_import_export.service.ts
+++ b/server/src/services/app_import_export.service.ts
@@ -355,8 +355,6 @@ export class AppImportExportService {
           appResourceMappings.dataQueryMapping
         );
 
-        // !-----
-
         let updateHomepageId = null;
 
         if (updatedDefinition?.pages) {
@@ -384,7 +382,10 @@ export class AppImportExportService {
             });
             const pageCreated = await manager.save(newPage);
 
+            appResourceMappings.pagesMapping[pageId] = pageCreated.id;
+
             mappedComponents.forEach((component) => {
+              appResourceMappings.componentsMapping[component.id] = component.id;
               component.page = pageCreated;
             });
 
@@ -451,8 +452,6 @@ export class AppImportExportService {
           }
         }
 
-        //!----
-
         await manager.update(
           AppVersion,
           { id: appResourceMappings.appVersionMapping[importingAppVersion.id] },
@@ -735,7 +734,7 @@ export class AppImportExportService {
               name: event.eventId,
               sourceId: mappedNewDataQuery.id,
               target: Target.dataQuery,
-              event: event.event,
+              event: event,
               index: queryEvents.index || index,
               appVersionId: mappedNewDataQuery.appVersionId,
             };