Js dsc 914

Should fix both issues raised in dsc-914.  Missing metadata on upload