Fixed several bug in the handling of current events in the Map Activity