Show data more reliably on map mode