Encode '+' characters in query string as '%2B'

Closes #38