add more support for server links