Fixing regressions in site selector.