map: fixed google search
Merge branch 'new-map' into next