Updated match scoring to handle new IDing