Story 45573183: new sorting of mapped controls and auto-selecting of newly created controls