Product selector performance fixes