Improved Location Searching