add improved partial management of errors and form content