More JSON formatting fixes - client crashing