Sort by Country, State, or County in Views sorts by ID, not by name

Within a view of CiviCRM contacts, if sorted by order of State.
Residents of DC, PR, and other 'non-states' are listed below all the States which are in alphabetical order.

The same issue goes for counties and countries. New countries such as South Sudan and Kosovo go at the end of the alphabet. County IDs are arbitrary, so they could really be in any order.