Add more attribute sets around server name override