Partially fixed the search