Mostly updates to search by distance