Index: branches/5.1.x/core/units/country_states/country_states_config.php =================================================================== diff -u -N -r13470 -r13545 --- branches/5.1.x/core/units/country_states/country_states_config.php (.../country_states_config.php) (revision 13470) +++ branches/5.1.x/core/units/country_states/country_states_config.php (.../country_states_config.php) (revision 13545) @@ -1,6 +1,6 @@ Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', - 'options_sql' => ' SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode + 'options_sql' => ' SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, CountryStateId FROM ' . TABLE_PREFIX . 'CountryStates WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' ORDER BY Name',