Fixed search a little bit