ISIS-2569: fixing wrong usages of BookmarkService
12 files changed