Fixed navigation issue with non-bookmarks.