Final fix for auto tagging