#1419 S3 search order now complete