Fixes #173 - but also a lot more than that…

This started as a fix for #173 - but it seems somewhere along the way, refreshing favorites from within the Favorites view broke. Also, viewing historical versions from within the favourites view broke.

This caused a lot more changes than it sounded like, but I think it's all sane now.

This is a regression bug. We NEED more comprehensive tests.