diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java
index e491ab3170..db1b11bc87 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java
@@ -173,7 +173,9 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
 				int AD_Field_ID = Integer.parseInt(fieldIdStr);
 				for(GridField gridField : tmpFields) {
 					if (gridField.getAD_Field_ID() == AD_Field_ID) {
-						fieldList.add(gridField);
+						if(gridField.isDisplayedGrid())
+							fieldList.add(gridField);
+						
 						break;
 					}
 				}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
index faf80d58b6..b41caae61b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java
@@ -259,8 +259,9 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
 		String display = text;
 		if (text != null && text.length() > MAX_TEXT_LENGTH)
 			display = text.substring(0, MAX_TEXT_LENGTH - 3) + "...";
-		if (display != null)
-			display = XMLs.encodeText(display);
+		// since 5.0.8, the org.zkoss.zhtml.Text is encoded by default
+//		if (display != null)
+//			display = XMLs.encodeText(display);
 		label.appendChild(new Text(display));
 		if (text != null && text.length() > MAX_TEXT_LENGTH)
 			label.setDynamicProperty("title", text);
diff --git a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
index d7a4d1adf3..c91a1b66a0 100644
--- a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
+++ b/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
@@ -1,6 +1,6 @@
 osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar
 equinox.use.ds=true
-osgi.bundles=org.eclipse.core.net,org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.hamcrest.core,org.junit,org.apache.commons.collections,org.apache.ant,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,org.eclipse.osgi.services,org.sat4j.core,org.sat4j.pb,org.eclipse.ecf,org.eclipse.ecf.filetransfer,org.eclipse.ecf.identity,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.httpclient.ssl,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.ssl,org.eclipse.equinox.ds@start,org.eclipse.equinox.event,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.http.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.transport.ecf,org.eclipse.equinox.security,org.eclipse.equinox.util,org.apache.commons.httpclient,org.eclipse.equinox.simpleconfigurator.manipulator,org.apache.commons.codec,org.eclipse.equinox.simpleconfigurator
+osgi.bundles=org.eclipse.core.net@start,org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.hamcrest.core,org.junit,org.apache.commons.collections,org.apache.ant,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,org.eclipse.osgi.services,org.sat4j.core,org.sat4j.pb,org.eclipse.ecf,org.eclipse.ecf.filetransfer,org.eclipse.ecf.identity,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.httpclient.ssl,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.ssl,org.eclipse.equinox.ds@start,org.eclipse.equinox.event,org.eclipse.equinox.frameworkadmin,org.eclipse.equinox.frameworkadmin.equinox,org.eclipse.equinox.http.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.p2.artifact.repository,org.eclipse.equinox.p2.console,org.eclipse.equinox.p2.core,org.eclipse.equinox.p2.director,org.eclipse.equinox.p2.director.app,org.eclipse.equinox.p2.engine,org.eclipse.equinox.p2.garbagecollector,org.eclipse.equinox.p2.jarprocessor,org.eclipse.equinox.p2.metadata,org.eclipse.equinox.p2.metadata.repository,org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives,org.eclipse.equinox.p2.transport.ecf,org.eclipse.equinox.security,org.eclipse.equinox.util,org.apache.commons.httpclient,org.eclipse.equinox.simpleconfigurator.manipulator,org.apache.commons.codec,org.eclipse.equinox.simpleconfigurator
 osgi.framework.extensions=
 osgi.bundles.defaultStartLevel=4
 eclipse.p2.profile=DefaultProfile