[pbs] Improve extraction (closes #16623, closes #16684)