Added tags with links