cleans up search partially, one test fails.

Last of #583

One test fails, going to leave a comment on the ticket :dash: