Changed CLIClient to avoid using parse_str. parse_str was applying urldecode to all parameters, since these are being written on command line, it should not be needed and causes emails in format email+text@address.com to swap the plus for a space.