Improve tourism markers and popups