[FEATURE query-params-new] Only scope conflicting query params

I'm sure this will need a bunch of changes.

cc @machty