Issue 3716 updates

Issue: https://code.google.com/p/otwarchive/issues/detail?id=3716

Fixes some broken links, and handles the case when Bookmarks are added to collections.