Re-order parameters in Omnisearch. See #1489.
Merging in Re-order parameters in Omnisearch. Fixes #1489.
git push origin masterMerge branch 'xiaohutai-refactor-omnisearch'