Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java,v
diff -u -r1.2 -r1.3
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java	31 Oct 2008 01:06:59 -0000	1.2
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/ChatCondition.java	3 Nov 2008 02:27:01 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java	31 Oct 2008 01:07:01 -0000	1.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.java	3 Nov 2008 02:27:01 -0000	1.3
@@ -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);