Added proper search based on long and lat
Fixed manual search