Fix initial selection of current host