more work on match extractor and repository