Issues 570 & 571: parameter validation on description and links
Fix copy/paste, minor cleanup