September second: add handling map callouts and star