[nova] Improve extraction (refs #23690)