Sanitized data and fixed validation