fix the form to have correct fields