more robust geo handling