diff --git a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx
index 17fd595..d6311e9 100644
--- a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx
+++ b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx
@@ -137,15 +137,26 @@ const CreateFormContent = ({ setOpen, onSubmit }) => {
     const onSubmitBase = (data) => {
         let result = { ...data };
 
-        result.before_image === null && delete result.before_image;
-        result.after_image === null && delete result.after_image;
+        if (result.before_image === null) {
+            delete result.before_image;
+            delete data.before_image;
+        }
+
+        if (result.after_image === null) {
+            delete result.after_image;
+            delete data.after_image;
+        }
+
         if (result.end_point === "") {
             delete result.end_point;
+            delete data.end_point;
         } else {
             result.end_point = `${result.end_point.lat},${result.end_point.lng}`;
         }
+
         if (result.start_point === "") {
             delete result.start_point;
+            delete data.start_point;
         } else {
             result.start_point = `${result.start_point.lat},${result.start_point.lng}`;
         }
diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
index 8f317ee..164fc70 100644
--- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
+++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
@@ -39,8 +39,8 @@ const EditController = ({ rowId, mutate, setOpenEditDialog, openEditDialog, row
                 defaultData={{
                     before_image: row.original?.files[0]?.full_path_for_fast_react || null,
                     after_image: row.original?.files[1]?.full_path_for_fast_react || null,
-                    item: row.original?.item || null,
-                    sub_item: row.original?.sub_item || null,
+                    item_id: row.original?.item || null,
+                    sub_item_id: row.original?.sub_item || null,
                     amount: row.original?.sub_item_data || null,
                     start_point: { lat: row.original?.start_lat || "", lng: row.original?.start_lng || "" },
                     end_point: { lat: row.original?.end_lat || "", lng: row.original?.end_lng || "" },
diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
index 37784dc..095c706 100644
--- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
+++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
@@ -4,8 +4,8 @@ import useRoadItemGetISubtems from "@/lib/hooks/useRoadItemGetISubtems";
 import EditFormCreate from "@/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate";
 
 const EditFormContent = ({ setOpenEditDialog, onSubmit, defaultData }) => {
-    const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(defaultData?.item);
-    const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item);
+    const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(defaultData?.item_id);
+    const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item_id);
 
     const defaultValues = {
         before_image: defaultData?.before_image || null,