More changes to searching, with the old/new stuff.