fix form field types