Improve submission form restoration.