Bug #994. Correct lookup of picklist values for State and Country Code fields