Finally resolved waypoint positioning issues, 2D and 3D map work now nicely together with less flicker