Search performance improvements

We will eventually need to make Search much faster

But probably only after we nail down the correct UX / UI