Changed order of searches