Refactoring of date sorted matchlist