WIP MDL-31989 search: Cleanup