Story 47788871,47789235 Improved initial state of control selector and fixed up pack helper to work properly with add/remove of list elements