For the doubles, they should have an automatic rule that when a country is to face itself in the Semis, they should end the semis and do a group of 4 round robin for the title, best of 3, all play all, games are to 15 with two serves rule. Automatic rule only applied to situations like Japan...