fixed saving fields when leaving one of the fields empty and added values to the form fields to be given at rendering