non-js form bug fix, event update