Fix #server so that it returns the right server instead of all servers
Merge pull request #1999 from sbergmann/master

Fix #server so that it returns the right server instead of all servers