Bug/json render02

### Description
Lots of improvements for JSON rendering