Fixes to automatic product selection and initial state handling