diff --git a/server/services/sqlServer/querys/dataMart/article.ts b/server/services/sqlServer/querys/dataMart/article.ts
index 9404ac1..03a7bab 100644
--- a/server/services/sqlServer/querys/dataMart/article.ts
+++ b/server/services/sqlServer/querys/dataMart/article.ts
@@ -121,7 +121,7 @@ V_Artikel.ProdArtikelBez as ProductFamily
 FROM dbo.V_Artikel (nolock)
 
 join
-dbo.V_Artikelvarianten (nolock) on AlplaPROD_usbow1.dbo.V_Artikel.IdArtikelvarianten = 
+dbo.V_Artikelvarianten (nolock) on dbo.V_Artikel.IdArtikelvarianten = 
 dbo.V_Artikelvarianten.IdArtikelvarianten
 
 join
@@ -159,7 +159,8 @@ left join
 	,GueltigabDatum as validDate
 	,EKPreis as price
 	,LiefArtNr as supplierNr
-	,case when len(Bemerkung) > 4 and  Bemerkung like '%UOM%' then LEFT(Bemerkung, CHARINDEX(' ', Bemerkung) - 1) else 'UOM:1' end as UOM
+	,case when Bemerkung is not null and  Bemerkung like '%UOM:%' then LEFT(Bemerkung, CHARINDEX(' ', Bemerkung)) else 'UOM:1' end as UOM
+	,Bemerkung
  	--,* 
 	from dbo.T_HistoryEK (nolock)
 	where