Fix CRITICAL cross-site scripting (xss) issues identified in sonarcloud