fix order in choice list