Support for tags with spaces