A little cleanup in /tv endpoint