IE Favorites with Longhorn

After mucking around in the badness that is the IE favorites system, I'm lefting wondering if there's hope for the future. Will IE use WinFS in Longhorn for storing favorites? Will we finally get searchable metadata for favorites? For the most part of I've given up on using favorites, relying on my googability for re-finding sites when I need them. Generally this works - until I realize that the only key words for identifying the site are too generic to be useful in Google. Then I long for superior bookmark system of that technical tour-de-force Netscape 2.0.

Help us, Lonhorn-Kenobi. You're our only hope.

Yes, yes, I know about Firebird/Mozilla/Opera/[Insert alternate browser here]. It's great, blah, blah, blah, but it's not preinstalled on every machine that I walk up to.