fix for tags with spaces