Fix returning of extractions & ids