Fixing tags with extra spaces