Added randomization of sites to try
Fixed executor restart