Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java
===================================================================
diff -u -rd52e38e168a77a2c8b0e58dfdde7d1e73fcfda31 -rc3dfbe202da2fcf3c18c4339689c5f12ac042abc
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java	(.../ChatCondition.java)	(revision d52e38e168a77a2c8b0e58dfdde7d1e73fcfda31)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java	(.../ChatCondition.java)	(revision c3dfbe202da2fcf3c18c4339689c5f12ac042abc)
@@ -105,8 +105,8 @@
 	}
 	StringBuilder stringPattern = new StringBuilder();
 	for (String excludedWord : excludedWords) {
-	    stringPattern.append("(?:").append(TextSearchCondition.WORD_DELIMITER_REGEX).append(
-		    Pattern.quote(excludedWord)).append(TextSearchCondition.WORD_DELIMITER_REGEX).append(")|");
+	    stringPattern.append("(?:").append(TextSearchCondition.NON_WORD_DELIMITER_REGEX).append(
+		    Pattern.quote(excludedWord)).append(TextSearchCondition.NON_WORD_DELIMITER_REGEX).append(")|");
 	}
 	stringPattern.deleteCharAt(stringPattern.length() - 1);
 	Pattern regexPattern = Pattern.compile(stringPattern.toString(), TextSearchCondition.PATTERN_MATCHING_OPTIONS);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java
===================================================================
diff -u -rd52e38e168a77a2c8b0e58dfdde7d1e73fcfda31 -rc3dfbe202da2fcf3c18c4339689c5f12ac042abc
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java	(.../ForumCondition.java)	(revision d52e38e168a77a2c8b0e58dfdde7d1e73fcfda31)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java	(.../ForumCondition.java)	(revision c3dfbe202da2fcf3c18c4339689c5f12ac042abc)
@@ -212,8 +212,8 @@
 	}
 	StringBuilder stringPattern = new StringBuilder();
 	for (String excludedWord : excludedWords) {
-	    stringPattern.append("(?:").append(TextSearchCondition.WORD_DELIMITER_REGEX).append(
-		    Pattern.quote(excludedWord)).append(TextSearchCondition.WORD_DELIMITER_REGEX).append(")|");
+	    stringPattern.append("(?:").append(TextSearchCondition.NON_WORD_DELIMITER_REGEX).append(
+		    Pattern.quote(excludedWord)).append(TextSearchCondition.NON_WORD_DELIMITER_REGEX).append(")|");
 	}
 	stringPattern.deleteCharAt(stringPattern.length() - 1);
 	Pattern regexPattern = Pattern.compile(stringPattern.toString(), TextSearchCondition.PATTERN_MATCHING_OPTIONS);