Added string sanitization