Fix some issue in the search.
More todo...