Only remove conflicting query params

[stephen-deg]

Fix issue where all query paths were removed. Instead, we should only remove potentially conflicting params that we later set to the runtime manually.