[DF-3070] fix review issues: change extraction logic