fix issue with server selection when target instances are inside a VPC and have no public ip address

Refactoring Issue #1