Fixed map geolocation async issue and wrapped name of event