#5 Refactored some of the product search classes