Improve host search feature when no more hosts can be found