Fix validation of choice fields and empty values