Fix the search order