Fixed match validation to avoid key error in TBD matches
Removed debug code