Fixing ectractor service preg matches