Refactor SigV2 and query params to support re-signing