Change submitting event to have the right contextdata.