Fix potential XSS vulnerability, plus a couple of duplicate tags in the resource.properties file.
Changed paths: