Fixing product query