Re #6972. Got search working on big cleanup.