diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java
index d4bac36e7c150771f7f01e6278187d166e85108a..c53e01e8af5ad9193cee174de22d5ed03fdefc59 100644
--- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java
+++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java
@@ -356,7 +356,7 @@ public class CloudantLegalTagRepository implements ILegalTagRepository {
 			legalTags = allDocResponse.getResponse().getDocsAs(BanckendLegalTag.class)
 					.stream()
 					.filter(lTag ->  lTag.getIs_Valid() == args.getIsValid())
-					.filter(f->f.getName().split("-")[0].equalsIgnoreCase(headers.getPartitionId()))
+					.filter(f->f.getName().length() > headers.getPartitionId().length() && f.getName().substring(0,headers.getPartitionId().length()).equalsIgnoreCase(headers.getPartitionId()))
 					.collect(Collectors.toList());
 
 		} catch (IOException e) {