diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 4e2c73bec..e15efa97b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -9,6 +9,8 @@
 * Fix issue in FHIRPath .combine focus handling 
 * Check Extension fixed values for URLs - enforce consistency
 * Fix R4 FML parser problem
+* Track and report inactive status when reported from terminology server
+* Add defense against large terminology operations causing obscure java errors
 
 ## Other code changes
 
@@ -24,8 +26,11 @@
 * Remove spurious logging in FHIRPath engine
 * Fix addChild error in PEBuilder (#1343) + Add test case
 * CPT Importer
-* Dependencies fixed: okhttp, thymeleaf, and commonmark
+* Dependencies fixed/updated: okhttp, thymeleaf, commonmark & UCUM
 * Xhtml fluent improvements + related XHtmlNode improvements
 * Release new pubpack for new icons
 * Json Object comparison: fix bug in arrays with multiple optional elements + improved error messages + support for external strings
 * fix cross-version extensions web references where possible
+* Don't suppress exceptions in terminology clients
+* Add first cut of Profile Generation code
+* Stop putting invalid codes in expansions if they are not in the code system
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java
index bb6c813ea..d5db1aa38 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java
@@ -207,7 +207,12 @@ public class ValueSetExpander extends ValueSetProcessBase {
     String dstLang = focus.getLanguage();
     
     boolean usedDisplay = false;
-    ConceptDefinitionDesignationComponent tu = expParams.hasParameter("displayLanguage") ? getMatchingLang(designations, expParams.getParameterString("displayLanguage")) : null;
+    ConceptDefinitionDesignationComponent tu;
+    if (LanguageUtils.langsMatch(dstLang, dispLang)) {
+      tu = null; // use display
+    } else {
+      tu = expParams.hasParameter("displayLanguage") ? getMatchingLang(designations, expParams.getParameterString("displayLanguage")) : null;
+    }
     if (tu != null) {
       n.setDisplay(tu.getValue());        
     } else if (display != null && (srcLang == null || dstLang == null || LanguageUtils.langsMatch(dstLang, srcLang))) {