Fix and improve rematch logic after a live game