Improve "Tags with ID" audit