Update so all fields are separate parameters
Update so all fields are separate parameters