Reimplemented the way the map is restored, now markers are not redrawn every time, but reused.