fix json structure as all now mandatory