Fixed empty values on choice fields