fixes and closes #1347

removing the escaping for ID matching

matching-ws/src/main/java/life/catalogue/matching/index/DatasetIndex.java

@@ -433,7 +433,7 @@ private static String escapeQueryChars(String s) {
   }
 
   private Optional<Document> getByUsageKey(String usageKey) {
-    Query query = new TermQuery(new Term(FIELD_ID, escapeQueryChars(usageKey)));
+    Query query = new TermQuery(new Term(FIELD_ID, usageKey));
     try {
       TopDocs docs = getSearcher().search(query, 3);
       if (docs.totalHits.value > 0) {
@@ -600,6 +600,11 @@ private static ExternalID toExternalID(Document doc, Dataset dataset) {
    */
   public NameUsageMatch matchByExternalKey(String key, Issue notFoundIssue, Issue ignoredIssue) {
 
+    NameUsageMatch usageMatch = matchByUsageKey(key);
+    if (usageMatch.getDiagnostics().getMatchType() != MatchType.NONE) {
+      return usageMatch;
+    }
+
     // if join indexes are present, add them to the match
     if (identifierSearchers != null && !identifierSearchers.isEmpty()){
       try {