Fix composed json bugs