Replaced the hard limit for the maximum number of matches