Update and fix EPGSelection and EventView