Add fix to remove empty hosts from the output