diff --git a/Conceptpower+Spring/pom.xml b/Conceptpower+Spring/pom.xml
index 912f86229..f4dac5d57 100644
--- a/Conceptpower+Spring/pom.xml
+++ b/Conceptpower+Spring/pom.xml
@@ -340,7 +340,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.1</version>
+			<version>3.4</version>
 		</dependency>
 
 		<!-- Jackson JSON Mapper -->
diff --git a/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLConceptMessage.java b/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLConceptMessage.java
index db90ed60a..1d3ead838 100644
--- a/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLConceptMessage.java
+++ b/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLConceptMessage.java
@@ -56,7 +56,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
 		// lemma
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.LEMMA + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getWord()));
+		sb.append(StringEscapeUtils.escapeXml10(entry.getWord()));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.LEMMA + ">");
 
@@ -70,21 +70,21 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
 		// description
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.DESCRIPTION + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getDescription()));
+		sb.append(StringEscapeUtils.escapeXml10(entry.getDescription()));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.DESCRIPTION + ">");
 
 		// concept list
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.CONCEPT_LIST + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getConceptList()));
+		sb.append(StringEscapeUtils.escapeXml10(entry.getConceptList()));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.CONCEPT_LIST + ">");
 
 		// creator id
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.CREATOR_ID + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getCreatorId() != null ? entry
+		sb.append(StringEscapeUtils.escapeXml10(entry.getCreatorId() != null ? entry
 				.getCreatorId().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.CREATOR_ID + ">");
@@ -92,7 +92,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
 		// equal to
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.EQUAL_TO + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getEqualTo() != null ? entry
+		sb.append(StringEscapeUtils.escapeXml10(entry.getEqualTo() != null ? entry
 				.getEqualTo().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.EQUAL_TO + ">");
@@ -100,7 +100,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
 		// modified by
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.MODIFIED_BY + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getModified() != null ? entry
+		sb.append(StringEscapeUtils.escapeXml10(entry.getModified() != null ? entry
 				.getModified().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.MODIFIED_BY + ">");
@@ -108,7 +108,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
 		// similar to
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.SIMILAR_TO + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getSimilarTo() != null ? entry
+		sb.append(StringEscapeUtils.escapeXml10(entry.getSimilarTo() != null ? entry
 				.getSimilarTo().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.SIMILAR_TO + ">");
@@ -116,7 +116,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
 		// synonym ids
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.SYNONYM_IDS + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getSynonymIds() != null ? entry
+		sb.append(StringEscapeUtils.escapeXml10(entry.getSynonymIds() != null ? entry
 				.getSynonymIds().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.SYNONYM_IDS + ">");
@@ -132,7 +132,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
 		}
 		sb.append(">");
 		if (type != null)
-			sb.append(StringEscapeUtils.escapeXml(type.getTypeName()));
+			sb.append(StringEscapeUtils.escapeXml10(type.getTypeName()));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.TYPE + ">");
 
@@ -146,7 +146,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
 		// wordnet id
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.WORDNET_ID + ">");
-		sb.append(StringEscapeUtils.escapeXml(entry.getWordnetId() != null ? entry
+		sb.append(StringEscapeUtils.escapeXml10(entry.getWordnetId() != null ? entry
 				.getWordnetId().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.WORDNET_ID + ">");
diff --git a/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLTypeMessage.java b/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLTypeMessage.java
index 8eb1fa1b7..0b29b9ed5 100644
--- a/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLTypeMessage.java
+++ b/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLTypeMessage.java
@@ -43,21 +43,21 @@ public List<String> appendEntry(ConceptType type, ConceptType supertype) {
 		}
 		sb.append(">");
 		if (type != null)
-			sb.append(StringEscapeUtils.escapeXml(type.getTypeName()));
+			sb.append(StringEscapeUtils.escapeXml10(type.getTypeName()));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.TYPE + ">");
 
 		// type description
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.DESCRIPTION + ">");
-		sb.append(StringEscapeUtils.escapeXml(type.getDescription()));
+		sb.append(StringEscapeUtils.escapeXml10(type.getDescription()));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.DESCRIPTION + ">");
 
 		// creator id
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.CREATOR_ID + ">");
-		sb.append(StringEscapeUtils.escapeXml(type.getCreatorId() != null ? type
+		sb.append(StringEscapeUtils.escapeXml10(type.getCreatorId() != null ? type
 				.getCreatorId().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.CREATOR_ID + ">");
@@ -65,7 +65,7 @@ public List<String> appendEntry(ConceptType type, ConceptType supertype) {
 		// matches
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.MATCHES + ">");
-		sb.append(StringEscapeUtils.escapeXml(type.getMatches() != null ? type
+		sb.append(StringEscapeUtils.escapeXml10(type.getMatches() != null ? type
 				.getMatches().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.MATCHES + ">");
@@ -73,7 +73,7 @@ public List<String> appendEntry(ConceptType type, ConceptType supertype) {
 		// modified by
 		sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.MODIFIED_BY + ">");
-		sb.append(StringEscapeUtils.escapeXml(type.getModified() != null ? type
+		sb.append(StringEscapeUtils.escapeXml10(type.getModified() != null ? type
 				.getModified().trim() : ""));
 		sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 				+ XMLConstants.MODIFIED_BY + ">");
@@ -89,7 +89,7 @@ public List<String> appendEntry(ConceptType type, ConceptType supertype) {
 					+ uriCreator.getTypeURI(supertype) + "\"");
 
 			sb.append(">");
-			sb.append(StringEscapeUtils.escapeXml(supertype.getTypeName()));
+			sb.append(StringEscapeUtils.escapeXml10(supertype.getTypeName()));
 			sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
 					+ XMLConstants.SUPERTYPE + ">");
 		}