Fix issue where Map navigation link fails to load map until refresh