Various bug fixes around selected product