Fixing tags, adding to taxonomy