Checkpoint part way into epg searching work
Major updates with watchlist