Wrestling with search. Seems to finally have it tamed...