Fixing the html unsafe mechanism