Fixed setting choice field default value