Add service name in channel EPG and other small changes