Enable searching for products and components too, more cleanup