diff --git a/src/command/unit/inspection/inspectionPointCommandHandler.ts b/src/command/unit/inspection/inspectionPointCommandHandler.ts
index 2a46ae1..a704f04 100644
--- a/src/command/unit/inspection/inspectionPointCommandHandler.ts
+++ b/src/command/unit/inspection/inspectionPointCommandHandler.ts
@@ -51,6 +51,7 @@ export default abstract class InspectionPointCommandHandler {
           .values(
             sync.map((s) => ({
               ...s,
+              id: points.some((p) => p.id == s.id) ? s.id : undefined,
               versionedPlanId,
             }))
           )
diff --git a/src/command/unit/inspection/inspectionVersionedPlanCommandHandler.ts b/src/command/unit/inspection/inspectionVersionedPlanCommandHandler.ts
index decbba2..151aa16 100644
--- a/src/command/unit/inspection/inspectionVersionedPlanCommandHandler.ts
+++ b/src/command/unit/inspection/inspectionVersionedPlanCommandHandler.ts
@@ -40,7 +40,13 @@ export default abstract class InspectionVersionedPlanCommandHandler {
           .into(inspectionPoint)
           .values(
             inspectionPoints.map((ip) => ({
-              ...ip,
+              title: ip.title,
+              description: ip.description,
+              type: ip.type,
+              min: ip.min,
+              max: ip.max,
+              others: ip.others,
+              sort: ip.sort,
               versionedPlanId: returnId,
             }))
           )
diff --git a/src/factory/admin/unit/inspection/inspectionPointResult.ts b/src/factory/admin/unit/inspection/inspectionPointResult.ts
index b258a6a..e210e57 100644
--- a/src/factory/admin/unit/inspection/inspectionPointResult.ts
+++ b/src/factory/admin/unit/inspection/inspectionPointResult.ts
@@ -11,7 +11,6 @@ export default abstract class InspectionPointResultFactory {
   public static mapToSingle(record: inspectionPointResult): InspectionPointResultViewModel {
     return {
       inspectionId: record.inspectionId,
-      inspectionVersionedPlanId: record.inspection.inspectionVersionedPlanId,
       inspectionPointId: record.inspectionPointId,
       inspectionPoint: InspectionPointFactory.mapToSingle(record.inspectionPoint),
       value: record.value,
diff --git a/src/service/unit/inspection/inspectionService.ts b/src/service/unit/inspection/inspectionService.ts
index e31ad0e..fbbe081 100644
--- a/src/service/unit/inspection/inspectionService.ts
+++ b/src/service/unit/inspection/inspectionService.ts
@@ -9,6 +9,9 @@ export default abstract class InspectionService {
       .getRepository(inspection)
       .createQueryBuilder("inspection")
       .leftJoinAndSelect("inspection.inspectionPlan", "inspectionPlan")
+      .leftJoinAndSelect("inspectionPlan.equipmentType", "equipmentType")
+      .leftJoinAndSelect("inspectionPlan.vehicleType", "vehicleType")
+      .leftJoinAndSelect("inspectionPlan.wearableType", "wearableType")
       .leftJoinAndSelect("inspection.inspectionVersionedPlan", "inspectionVersionedPlan")
       .leftJoinAndSelect("inspectionVersionedPlan.inspectionPoints", "inspectionPoints")
       .leftJoinAndSelect("inspection.pointResults", "pointResults")
diff --git a/src/viewmodel/admin/unit/inspection/inspection.models.ts b/src/viewmodel/admin/unit/inspection/inspection.models.ts
index 4d18e7c..7efdede 100644
--- a/src/viewmodel/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodel/admin/unit/inspection/inspection.models.ts
@@ -40,7 +40,6 @@ export type InspectionViewModel = {
 
 export interface InspectionPointResultViewModel {
   inspectionId: string;
-  inspectionVersionedPlanId: string;
   inspectionPointId: string;
   inspectionPoint: InspectionPointViewModel;
   value: string;