Convertion state bdd & Fix Xss