Fixing tag unicode bug