Changes which fixes ZK-2270 and solves ZK-2272.

http://tracker.zkoss.org/browse/ZK-2272
http://tracker.zkoss.org/browse/ZK-2270