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