fixes on formhandler