better implementation for reverting form answers