Tidied up how numbered sets can be matched, so they can only have the cards number required