fixing the search related issues