Rewrite the whole thing using queryParams
merging fixes