[tf1] Improve extraction and fix issues (closes #21372)