2722 locale selectors

Addresses #2722
much simpler