Fixes QueryString composition