fix nested form fields