Fix dataset form

Extras were not kept if there were errors while creating a dataset (as
they are top level fields)

Owner org was not kept in the select box