[tvnow] Fix issues, simplify and improve (closes #15837)