Fixes #20867 - pin down scoped search
(cherry picked from commit 913d8f73fb0c36096e30d0c6be9a6f822d237e64)
Fixes #20867 - pin down scoped search
(cherry picked from commit 913d8f73fb0c36096e30d0c6be9a6f822d237e64)