LPS-32936

LPS-32936 Simplify scope selection UI