Few fixes in search