Improved JSON for EIT/EPG