added map and search
map working