More work on subentities extraction.