diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
index d5fa257a28..73e7431e29 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
@@ -39,6 +39,7 @@ import org.compiere.util.CLogger;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 import org.compiere.util.Msg;
+import org.compiere.util.Util;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Intbox;
@@ -140,9 +141,9 @@ public class InfoBPartnerPanel extends InfoPanel implements EventListener, WTabl
 	private void initComponents()
 	{
 		lblValue = new Label();
-		lblValue.setValue(Msg.translate(Env.getCtx(), "Value").substring(1));
+		lblValue.setValue(Util.cleanAmp(Msg.translate(Env.getCtx(), "Value")));
 		lblName = new Label();
-		lblName.setValue(Msg.translate(Env.getCtx(), "Name").substring(1));
+		lblName.setValue(Util.cleanAmp(Msg.translate(Env.getCtx(), "Name")));
 		lblContact = new Label();
 		lblContact.setValue(Msg.translate(Env.getCtx(), "Contact"));
 		lblEMail = new Label();
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
index a03e7f9b3f..36cf2947f5 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
@@ -40,6 +40,7 @@ import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
+import org.compiere.util.Util;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zul.Separator;
 
@@ -174,7 +175,7 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener
 
 		//	Set & enable Fields
 		
-		lbl1.setValue(Msg.translate(Env.getCtx(), m_queryColumns.get(0).toString()).substring(1));
+		lbl1.setValue(Util.cleanAmp(Msg.translate(Env.getCtx(), m_queryColumns.get(0).toString())));
 		
 		if (m_queryColumns.size() > 1)
 		{
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
index 8d23b1398e..b78c5f1c8e 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
@@ -141,7 +141,7 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
    
     private void initComponents()
     {
-        lblDocumentNo = new Label(Msg.translate(Env.getCtx(), "DocumentNo").substring(1));
+        lblDocumentNo = new Label(Util.cleanAmp(Msg.translate(Env.getCtx(), "DocumentNo")));
         lblDescription = new Label(Msg.translate(Env.getCtx(), "Description"));
         lblDateInvoiced = new Label(Msg.translate(Env.getCtx(), "DateInvoiced"));
         lblGrandTotal = new Label(Msg.translate(Env.getCtx(), "GrandTotal"));
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
index 76ab25bc63..e11249c505 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
@@ -135,7 +135,7 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
     }
     public void initComponents()
     {
-        lblDocumentNo = new Label(Msg.translate(Env.getCtx(), "DocumentNo").substring(1));
+        lblDocumentNo = new Label(Util.cleanAmp(Msg.translate(Env.getCtx(), "DocumentNo")));
         lblDescription = new Label(Msg.translate(Env.getCtx(), "Description"));
         lblDateOrdered = new Label(Msg.translate(Env.getCtx(), "DateOrdered"));
         lblOrderRef = new Label(Msg.translate(Env.getCtx(), "POReference"));
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
index 462290b111..27bc24bc84 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
@@ -206,9 +206,9 @@ public class InfoProductPanel extends InfoPanel implements EventListener
 	private void initComponents()
 	{
 		lblValue = new Label();
-		lblValue.setValue(Msg.translate(Env.getCtx(), "Value").substring(1));
+		lblValue.setValue(Util.cleanAmp(Msg.translate(Env.getCtx(), "Value")));
 		lblName = new Label();
-		lblName.setValue(Msg.translate(Env.getCtx(), "Name").substring(1));
+		lblName.setValue(Util.cleanAmp(Msg.translate(Env.getCtx(), "Name")));
 		lblUPC =  new Label();
 		lblUPC.setValue(Msg.translate(Env.getCtx(), "UPC"));
 		lblSKU = new Label();
@@ -220,7 +220,7 @@ public class InfoProductPanel extends InfoPanel implements EventListener
 		lblProductCategory.setValue(Msg.translate(Env.getCtx(), "M_Product_Category_ID"));
 		//
 		lblWarehouse = new Label();
-		lblWarehouse.setValue(Msg.getMsg(Env.getCtx(), "Warehouse").substring(1));
+		lblWarehouse.setValue(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Warehouse")));
 		lblVendor = new Label();
 		lblVendor.setValue(Msg.translate(Env.getCtx(), "Vendor"));