sorry i rebased the commit because i found some issues while switching between channels in epg view.