Fixed error figuring out if there was a small number of hosts
Separated out host expansion to better handle different methods