[Backport] Ensure order number searches don't error