Fix Multiple XSS Issues