[rentv] Improve extraction (closes #15227)