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

I noticed on Jenkins that the test_filter_by_region would intermittently fail. I believe that this is due to the way the city and region locators were setup. In the case where there is no city or region, the nth-child properties wouldn't work properly. I updated the locator to be consistent with the country locator. I tested this on dev and stage and did get some failures though due to unrelated areas.