Should fix problem with search crashing