Fix issue for search