[tf1] Fix wat id extraction (closes #21365)