I've always found the bookmarks pretty infuriating, because the window that lists them is modal.
The new favourites window is much better. The hierarchical organisation would also make it easier to find the tag you are looking for.
I was think then, why extend the favourites functionality, so that it can store the locations within files, as well as the filename.
The hierarchy could show all the files, and the bookmarks within them.
Or make the bookmark editor hierachical and non-modal ... 