Removed old multi map logic
+ Added merged waypoint/poi marker logic