Modified search a little bit