Fix issue #163 by encoding spaces as + and encoding + as %2B