VID-319 Don't add extra <a> tags