Little adjustments to Event
Populate map (a bit workaroundish, but it works)