Fixed search conditionals

I think.