Preserved field choice if type selection has changed.
Fixed application freeze on bad user input.