LPS-32936 Simplify scope selection UI
LPS-32936 Sort