issue #19800: move hiding logic to the site picker itself