Even more Json rendering optimizations