Bug fixes to the product search