Product selector fixes