diff --git a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
index 992989a880..59f6e7b4a1 100644
--- a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
+++ b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
@@ -675,9 +675,9 @@ public class MLookupFactory
 			embedSQL.append(BaseTable).append(".").append(BaseColumn);
 			embedSQL.append("=").append(TableNameAlias).append(".").append(KeyColumn);
 		} else if (translated) {
-			embedSQL.append(TableNameAlias).append(".").append(BaseColumn).append("=").append(column.getColumnSQL());
+			embedSQL.append(TableNameAlias).append(".").append(KeyColumn).append("=").append(column.getColumnSQL());
 		} else {
-			embedSQL.append(BaseColumn).append("=").append(column.getColumnSQL());
+			embedSQL.append(KeyColumn).append("=").append(column.getColumnSQL());
 		}
 
 		return embedSQL.toString();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
index 6a49334c0f..bcfbfa902c 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
@@ -61,7 +61,7 @@ public class HTMLExtension implements IHTMLExtension {
 		href.setStyle("text-decoration: none; font-size: 11px; vertical-align: middle;");
 		href.addAttribute("onclick", "parent.zoom('" 
 				+ componentId + "', '" 
-				+ dataElement.getColumnName() + "', '" 
+				+ dataElement.getForeignColumnName() + "', '" 
 				+ dataElement.getValueAsString() + "')");
 		window.addElement(href);
 		menu.addElement(window);