Prevent duplication on checkout validation
Repopulate checkout options, partial fix for #255