Bugfixing, important XSS fix