better server share handling