Fix empty array and object format