Products/sound search tweaks and refactoring