Fixed query breaking when using some product widgets and closes #3333