Improved location search