Fix products query ambiguity