keep the search order
Merge pull request #239 from solawingg/development

Keep the search order