More link and tagging fixes.