Fixed support for province and country codes