make history navigation less buggy (though still an extra step between markers)