Closes #234 - Always allow pre-selection of plans