Change order of searches to save memory
Merge pull request #6491 from wmtan/MemorySaving

Change order of searches to save memory