Renabled auto tagging