Better JSON part 2

Signed-off-by: Anders Bech Mellson <mellson@icloud.com>