chenge form handler and fix bug.