Addreses tag links in #201