Fix submission form fields bug