Added more liberal handling of formfields