@andrerom, @lserwatka, @patrickallaert: Here is the new PR https://github.com/ezsystems/ezdemo/pull/15. I think this one can be closed