updated: working search and map display