fix for location naming brek after AddressManager changes