Preserve order of search results

Change-Id: If081538840e7a699665b8982480dfa3393f3dde9
Merge "Preserve order of search results"