Include query strings in the redirect location

Closes #2