Fix for prevent XSS attacks
Fix for prevent XSS attacks - uncomment stuff