[wat] improve extraction(#10281)