INFRA-1420 adding hostnames and help menu fix