Work on better match fetching.