form: initial data handling changed