diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index 6c942099e0..4a0d257fe7 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.adempiere.base.process
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
-Export-Package: org.adempiere.process
+Export-Package: org.adempiere.process,
+ org.compiere.process
 Import-Package: javax.mail;version="1.4.0",
  javax.mail.internet;version="1.4.0",
  javax.servlet;version="2.5.0",
diff --git a/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java b/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java
index 1f4ee365a7..cadddb38d9 100644
--- a/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java
+++ b/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java
@@ -29,6 +29,8 @@ import org.compiere.util.CLogger;
  * <li> https://sourceforge.net/tracker/?func=detail&aid=2875989&group_id=176962&atid=879332
  * <li> BF2947615 The document recplicacion not working
  * <li> https://sourceforge.net/tracker/?func=detail&aid=2947615&group_id=176962&atid=879332
+ * <li> IDEMPIERE-218 Replication not working in ZK
+ * <li> http://jira.idempiere.com/browse/IDEMPIERE-218
  */
 public class MReplicationStrategy extends X_AD_ReplicationStrategy {
 
@@ -60,7 +62,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
 	public List <X_AD_ReplicationTable> getReplicationTables() {
 		final String whereClause = I_AD_ReplicationTable.COLUMNNAME_AD_ReplicationStrategy_ID+"=?"; // #1
 		return new Query(getCtx(), I_AD_ReplicationTable.Table_Name, whereClause, get_TrxName())
-			.setClient_ID()
 			.setParameters(getAD_ReplicationStrategy_ID())
 			.setOnlyActiveRecords(true)
 			.setApplyAccessFilter(false)
@@ -74,7 +75,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
 	public List<X_AD_ReplicationDocument> getReplicationDocuments() {
 	    	final String whereClause = I_AD_ReplicationDocument.COLUMNNAME_AD_ReplicationStrategy_ID+"=?"; // #1
 		return new Query(getCtx(),I_AD_ReplicationDocument.Table_Name,whereClause,get_TrxName())
-			.setClient_ID()
 			.setParameters(getAD_ReplicationStrategy_ID())
 			.setOnlyActiveRecords(true)
 			.setApplyAccessFilter(false)
@@ -92,7 +92,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
 	    	final String whereClause = I_AD_ReplicationTable.COLUMNNAME_AD_ReplicationStrategy_ID + "=? AND "
 	    				 			 + I_AD_ReplicationTable.COLUMNNAME_AD_Table_ID + "=?";
 		return new Query(ctx, I_AD_ReplicationTable.Table_Name, whereClause, null)
-			.setClient_ID()
 			.setOnlyActiveRecords(true)
 			.setApplyAccessFilter(false)
 			.setParameters(AD_ReplicationStrategy_ID, AD_Table_ID)
@@ -110,7 +109,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
 	    	final String whereClause = I_AD_ReplicationDocument.COLUMNNAME_AD_ReplicationStrategy_ID + "=? AND "
 			 		 				 + I_AD_ReplicationDocument.COLUMNNAME_AD_Table_ID + "=?";
 		return new Query(ctx, I_AD_ReplicationDocument.Table_Name, whereClause, null)
-			.setClient_ID()
 			.setOnlyActiveRecords(true)
 			.setApplyAccessFilter(false)
 			.setParameters(AD_ReplicationStrategy_ID, AD_Table_ID)
@@ -129,7 +127,6 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy {
 	    						 + I_AD_ReplicationDocument.COLUMNNAME_AD_Table_ID + "=? AND "
 	    						 + I_AD_ReplicationDocument.COLUMNNAME_C_DocType_ID + "=?";
 		return new Query(ctx, X_AD_ReplicationDocument.Table_Name, whereClause, null)
-			.setClient_ID()
 			.setOnlyActiveRecords(true)
 			.setApplyAccessFilter(false)
 			.setParameters(AD_ReplicationStrategy_ID, AD_Table_ID, C_DocType_ID)