[TV] - :bug: template changes