remove logic where defaultValues were not lifted.  this had the nasty side effect of creating lots of headers around zero values