diff --git a/org.adempiere.ui.zk/WEB-INF/zk.xml b/org.adempiere.ui.zk/WEB-INF/zk.xml
index 877f0ddeb7..c843b75ae6 100644
--- a/org.adempiere.ui.zk/WEB-INF/zk.xml
+++ b/org.adempiere.ui.zk/WEB-INF/zk.xml
@@ -12,7 +12,7 @@
 		</listener-class>
 	</listener>
 
-	<!-- uncomment following to debug event flow -->
+	<!-- uncomment following to debug server event flow -->
 	<!-- listener>
 	    <listener-class>org.adempiere.webui.util.LogEventInterceptor</listener-class>
 	</listener -->
@@ -23,9 +23,9 @@
 		<log-base></log-base>
 	</log>
 
-	<!--  change to false to use compress js which is much smaller -->
+	<!--  false to use compress js which is much smaller. change to true if you need to debug -->
 	<client-config>
-		<debug-js>true</debug-js>
+		<debug-js>false</debug-js>
 		<processing-prompt-delay>500</processing-prompt-delay>
 	</client-config>
 
@@ -46,9 +46,10 @@
 		</system-config>
 	-->
 
-	<system-config>
+	<!-- uncomment the following for selenium testing -->
+	<!--  system-config>
 		<id-generator-class>org.adempiere.webui.AdempiereIdGenerator</id-generator-class>
-	</system-config>
+	</system-config -->
 
 	<!--
 		polling - org.zkoss.zkex.ui.impl.PollingServerPush
@@ -56,10 +57,10 @@
 	-->
 	<device-config>
  		<device-type>ajax</device-type>
-<!--		<server-push-class>org.zkoss.zk.ui.impl.PollingServerPush</server-push-class> -->
       	<server-push-class>fi.jawsy.jawwa.zk.atmosphere.AtmosphereServerPush</server-push-class>
 	</device-config>
 
+	<!-- true for better performance and lower resource usage -->
 	<system-config>
 		<disable-event-thread>true</disable-event-thread>
 	</system-config>
diff --git a/org.adempiere.ui.zk/js/jquery-patch.js b/org.adempiere.ui.zk/js/jquery-patch.js
index 7699aeda63..cc7fda845f 100644
--- a/org.adempiere.ui.zk/js/jquery-patch.js
+++ b/org.adempiere.ui.zk/js/jquery-patch.js
@@ -2,24 +2,34 @@
 (function(undefined) {
 var rupper = /([A-Z]|^ms)/g;
 if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	var old = document.defaultView.getComputedStyle;
 	getComputedStyle = function( elem, name ) {
 		var ret, defaultView, computedStyle;
 
-		//added try catch for firefox
-		try {
-			name = name.replace( rupper, "-$1" ).toLowerCase();
-	
-			if ( !(defaultView = elem.ownerDocument.defaultView) ) {
-				return undefined;
-			}
+		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return undefined;
+		}
 		
-			if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+		if (name == undefined || name == null) {
+			try {
+				return old(elem, null);
+			} catch (err) {
+				return "";
+			}
+		}
+		
+		name = name.replace( rupper, "-$1" ).toLowerCase();
+		
+		try {			
+			if ( (computedStyle = old( elem, null )) ) {
 				ret = computedStyle.getPropertyValue( name );
 				if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
 					ret = jQuery.style( elem, name );
 				}
 			}
-		} catch (err) {}
+		} catch (err) {
+			return "";
+		}
 
 		return ret;
 	};