Fixed map when switching back and forth with list