Add map search
Merge branch 'dev'