Fix bug that sometimes caused editing and moving of bookmarks to operate on the wrong...