Fix some issues after introducing BookmarksModel