more search changes

still dragging along