Re-order parameters in Omnisearch. See #1489.