fix the two outstanding noncollection upload bugs
tidy
set has_children properly...
Merge pull request #893 from nla/js-dsc-1210

Js dsc 1210