Update json smart, small improvements