Minor changes in search

and using a bit more time