Return JSON from waterfall mapper.
Fix bug when optional restiming data is not present.