Fixed search breaking of multiple spaces