Preserve options in session