updated mapper for geo-entities with multiple words