search + geo
Merge branch 'nem'