Escape plus '+' becuase of the S3 bug