Further updates to improve handling of upload forms.