Use safetext on links.
Better formatting if language parameters are required.
Merge pull request #1992 from cmfcmf/minor-fixes

Minor fixes