Make it possible to add/remove bookmarks and notifications with only an id.
Merge branch 'feature-easier-bookmarks' into develop