fix history navigation a bit