Fix product queries