Fix for other XSS attack vulnerability

Just found some more XSS attack vulnerability. Fixed.