Apply prope sanitization to avoid stripping characters that shouldn't actually be stripped
Merge branch 'proper-sanitize'