Fix issue with duplicated bookmarks (Fix #17)