Changed city/town name to lcosation/address