Wizard and multi-select fixes and enhancements.

Change-Id: I069378b8e5540b41147209fa6b111e59f9e53c61