[Rte] Improve extractor