Fix bug 884135 - Deal with spaces in tag names