Search and map for single location working, now to adjust to all