Fixed loading correct matches