Add the search stuff again as it got lost in a merge.

- Lost in Merge, sound like a follow up to Lost in Translation.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>