Fixed extra fields issue in forms.