V2.4 - Add XSS detection and fix multiple bug