add form-error and revert generic error. Fix commas on deprecated fields