fixed event handlers
Merge branch 'json_table' of https://github.com/guanzo/CHCYF into json_table