Got the matching back on track for larger datasets