Fix merging file uploads with query and post params in AbstractForm