fix issues with map, events, select menu