Some fixes for bookmarks reordering