Organic product search logic updated and fixed