Fixed bugs with duplicate bookmarks

- Resolved issues with Manual bookmarks
- Resolved issues with duplicate bookmarks

Resolves #2