BZ-12992:ECM Wizard Selector Improvements