Fixes #14686 - Allow scoped search on ID for organizations
(cherry picked from commit 6ee7a8b40807944058c664248570a3031cdb6172)
Fixes #14686 - Allow scoped search on ID for organizations
(cherry picked from commit 6ee7a8b40807944058c664248570a3031cdb6172)