Improved search and map display
Merge remote-tracking branch 'origin/master'
merge