Preserve query parameters on redirect

@adrm - does Gerald’s response to this question provide an answer for you at all?