Fixed defect with special characters in tag