Fix duplicated links, add more tags
Merge remote-tracking branch 'hoatle/fix_deprecated_links' into develop