Fixed geo name issues - hotfix