Fixed search crashing