more autodiscovery of location