Add support for search order numbers. #2020