Code cleanup
Bugfixe with the XSS filter