Fix redirection so query strings are not added multiple times
Merge pull request #161 from kaptajnen/307fix

Fix redirection so query strings are not added multiple times