Fix for location search