Improve host selection system