Remove broken links, add tags support