Fix Bug and add Bookmark feature in combine with Back-to-First-Error