diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
index 65d8c9f2bfaafe979800468590efa6109a4a6747..71f03fb3cb3abf64d9876413f3627bbd2d15a5ed 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndexerServiceImpl.java
@@ -395,9 +395,9 @@ public class IndexerServiceImpl implements IndexerService {
             document.setLegal(storageRecord.getLegal());
             if (storageRecord.getTags() == null) {
                 Map<String, String> constantTags = new HashMap<>();
-                constantTags.put(IndexerServiceImpl.NORMALIZATION_KIND_TAG_ATTRIBUTE_NAME, String.format("%s:%s:%s:%s", authority, source, type, versionParts[0]));
                 storageRecord.setTags(constantTags);
             }
+            storageRecord.getTags().put(IndexerServiceImpl.NORMALIZATION_KIND_TAG_ATTRIBUTE_NAME, String.format("%s:%s:%s:%s", authority, source, type, versionParts[0]));
             document.setTags(storageRecord.getTags());
             document.setCreateUser(storageRecord.getCreateUser());
             document.setCreateTime(storageRecord.getCreateTime());