Fixed search somewhat