EPG Timeline fixes