Switch hostname and service so they are in correct position