[FEATURE query-params-new] Only scope conflicting query params
Merge pull request #4186 from raytiley/qp-changes

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