modify map event handling