Improving handling for multiple forms.