Further improve hyperlinks to entities