Added escape for ' ' with '+'.