diff --git a/server/services/dataMart/controller/fakeEDIUpdate.ts b/server/services/dataMart/controller/fakeEDIUpdate.ts
index bd65d5f..d7fbca0 100644
--- a/server/services/dataMart/controller/fakeEDIUpdate.ts
+++ b/server/services/dataMart/controller/fakeEDIUpdate.ts
@@ -1,3 +1,4 @@
+import { format } from "date-fns-tz";
 import { createLog } from "../../logger/logger.js";
 import { query } from "../../sqlServer/prodSqlServer.js";
 import { fakeEDIUpdate } from "../../sqlServer/querys/dataMart/fakeEDIUpdate.js";
@@ -23,10 +24,17 @@ export const getFakeEDI = async (address: string) => {
     try {
         fakeEDI = await query(updatedQuery, "Gets fakeEDI orders to be fixed");
 
+        const correctedData = fakeEDI.data.map((n: any) => {
+            return {
+                ...n,
+                DeliveryDate: format(n.DeliveryDate, "M/d/yyyy HH:mm"),
+            };
+        });
+
         return {
             success: true,
             message: "Current open orders",
-            data: fakeEDI.data,
+            data: correctedData,
         };
     } catch (error) {
         console.log(error);
diff --git a/server/services/logistics/controller/dm/ordersIn/mappings/macroImport.ts b/server/services/logistics/controller/dm/ordersIn/mappings/macroImport.ts
index 913c3f4..2d9b906 100644
--- a/server/services/logistics/controller/dm/ordersIn/mappings/macroImport.ts
+++ b/server/services/logistics/controller/dm/ordersIn/mappings/macroImport.ts
@@ -118,8 +118,12 @@ export const macroImportOrders = async (data: any, user: any) => {
         filterOrders.forEach((oo: any) => {
             const isMatch = openOrders.some(
                 (o: any) =>
+                    // check the header
                     String(o.CustomerOrderNumber).trim() ===
-                    String(oo.CustomerOrderNumber).trim()
+                        String(oo.CustomerOrderNumber).trim() &&
+                    // and check the customer release is not in here.
+                    String(o.CustomerRealeaseNumber).trim() ===
+                        String(oo.CustomerRealeaseNumber).trim()
             );
             if (!isMatch) {
                 console.log(`ok to update: ${oo.CustomerOrderNumber}`);
diff --git a/server/services/logistics/controller/dm/ordersIn/mappings/standardOrders.ts b/server/services/logistics/controller/dm/ordersIn/mappings/standardOrders.ts
index 539871c..25c5edf 100644
--- a/server/services/logistics/controller/dm/ordersIn/mappings/standardOrders.ts
+++ b/server/services/logistics/controller/dm/ordersIn/mappings/standardOrders.ts
@@ -109,8 +109,12 @@ export const standardOrders = async (data: any, user: any) => {
         filterOrders.forEach((oo: any) => {
             const isMatch = openOrders.some(
                 (o: any) =>
+                    // check the header
                     String(o.CustomerOrderNumber).trim() ===
-                    String(oo.CustomerOrderNumber).trim()
+                        String(oo.CustomerOrderNumber).trim() &&
+                    // and check the customer release is not in here.
+                    String(o.CustomerRealeaseNumber).trim() ===
+                        String(oo.CustomerRealeaseNumber).trim()
             );
             if (!isMatch) {
                 console.log(`ok to update: ${oo.CustomerOrderNumber}`);
diff --git a/server/services/sqlServer/querys/dataMart/fakeEDIUpdate.ts b/server/services/sqlServer/querys/dataMart/fakeEDIUpdate.ts
index ddd8d5a..161115e 100644
--- a/server/services/sqlServer/querys/dataMart/fakeEDIUpdate.ts
+++ b/server/services/sqlServer/querys/dataMart/fakeEDIUpdate.ts
@@ -1,10 +1,10 @@
 export const fakeEDIUpdate = `
 Select LEFT(ArtikelVariantenAlias, charindex(' ', ArtikelVariantenAlias) - 1) CustomerArticleNumber,
-AuftragsNummer AS CustomerOrderNumber, 
-PositionsNummer as CustomerLineNumber,
-AbrufNummer AS CustomerRealeaseNumber,
+cast(AuftragsNummer as varchar) AS CustomerOrderNumber, 
+cast(PositionsNummer  as varchar)as CustomerLineNumber,
+cast(AbrufNummer  as varchar)AS CustomerRealeaseNumber,
 AbrufMenge AS Quantity,
-' ' AS DeliveryDate,
+AbrufLiefertermin AS DeliveryDate,
 IdAdresse AS CustomerID,
 ' ' AS Remark
 --,*
diff --git a/server/services/sqlServer/querys/dm/orderState.ts b/server/services/sqlServer/querys/dm/orderState.ts
index 331a817..f2e8952 100644
--- a/server/services/sqlServer/querys/dm/orderState.ts
+++ b/server/services/sqlServer/querys/dm/orderState.ts
@@ -1,6 +1,7 @@
 export const orderState = `
 SELECT top(10000) 
 CustomerOrderNumber 
+,r.CustomerReleaseNumber
 , OrderState
 , r.ReleaseState
 , h.CreatedByEdi