Search revamp

I don't see any risk with it, but if you feel very strongly about it we can put defer back.