Fix merge-uris and add more canonical links.