KM/Batoto: Generalized and fixed regex extract.