prevent parameters which would be used as query string being escaped 2 times
closes #622