Removed the conversion of + to spaces