BUG: replaced dictionary to ordered dictionary to keep the data
     ordered when choice set are strings.