Update admin area to show Country and City (try 2)