Fix a typo
Merge branch 'newMapSearch' into integration