[tvn24] Improve extraction (closes #11679)