added jump from Location to Map and from Map to Location