Product Query block hijacks all further queries

[sunyatasattva]

Describe the bug

When you add a Product Query block and select a custom query attribute (i.e. set the toggle to display “On sale products”), adding further Product Query blocks or even normal Query Loop blocks will result in the query always being the filtered one. This is due to the fact that we register the filter every time before we render a Query Loop block.

To reproduce

Steps to reproduce the behavior:

1. Add a Product Query block
2. Set the toggle to display “On sale products”
3. Add another Product Query block on the same page
4. Do not set the toggle
5. Add a Query Loop block
6. Set it to display your posts
7. Go to the front-end
8. Notice that all three blocks will display only on sale products

Expected behavior

Each Query Loop block should retain its own query.