improving location selection algorithm, added missing dc-c2 tunnel