diff --git a/uk/ac/sanger/artemis/io/PublicDBDocumentEntry.java b/uk/ac/sanger/artemis/io/PublicDBDocumentEntry.java
index afcf1738316bbd3264926f99b94b3a037d42b6da..c86dba9b634f4ad3779b78a212f8a6af59772a41 100644
--- a/uk/ac/sanger/artemis/io/PublicDBDocumentEntry.java
+++ b/uk/ac/sanger/artemis/io/PublicDBDocumentEntry.java
@@ -419,10 +419,14 @@ public class PublicDBDocumentEntry extends SimpleDocumentEntry
           String val = (String)newValues.get(j);
           
           int ind = 0;
-          if((ind=val.indexOf(";db_xref="))>-1)
+          
+          if((ind=val.indexOf(";db_xref="))>-1 && this instanceof EmblDocumentEntry)
+            val = val.substring(0,ind);
+          
+          if((ind=val.indexOf(";evidence="))>-1 && this instanceof EmblDocumentEntry)
             val = val.substring(0,ind);
           
-          if((ind=val.indexOf(";evidence="))>-1)
+          if((ind=val.indexOf(";with="))>-1 && this instanceof EmblDocumentEntry)
             val = val.substring(0,ind);
           
           if(val.startsWith("term="))