update region and city locators to be more robust and match country locator
Merge pull request #170 from dchunwong/updatelocators

Update region and city locators to be more robust and match country locator