[ro220] Fix broken extractor and modernize (#4054)