Fixing Map and Event list Functionality