Refactoring, must add links in the items from the archive