Fixing tags and adjusting taxonomy