Ensure tags are annotated