Fix name substitusion on roster scrape
Fix match winner check