Added lookup for location on server.