Applying part ofthe patch from #1317540 - fix for Special Characters when using taxonomy on comments.