Fix linking from and linking to and also include the direct urls to those urls