bugfix: reset map only once on navigate #777

Complicated to write a test for this as it's mainly visual. Use the test from the issue to reproduce.

Closes #777 (closed)