Fixed search breaking