Search revamp

I see what you're doing here now. It's not very nice that we are still requesting these results, even though we aren't using them.