Many search updates and fixes