Fixing data sanitization issues