Improve formatting of json on all calls