Hopefully fixed bugs with json-show
Minor tweaks