Fix table Tagging to avoid duplicate rows