Merge changes to watch-list caching from master.
Modify some bookmark backend calls and add move/delete