XSS fix
Compatibility with site code