[CH-21] Updated JSON structure for data displaying