Add some more options for EPG and siplify name(needs adjust in po file)