Fixed Potential XSS Issues