diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 03cfb8aa1..5cf2184f6 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.7.17
  - fixed #10654: Story Archive: Search not working properly
+ - fixed search indexer concatenates keywords to content.
 
 7.7.16
  - fixed #10590: Session::DateTime->secondsToInterval doesn't allow 7 weeks
diff --git a/lib/WebGUI/Search/Index.pm b/lib/WebGUI/Search/Index.pm
index 7cefb1990..12026e689 100644
--- a/lib/WebGUI/Search/Index.pm
+++ b/lib/WebGUI/Search/Index.pm
@@ -83,13 +83,7 @@ sub addKeywords {
 	my $text = join(" ", @_);
 
 	$text = WebGUI::HTML::filter($text, "all");
-	#-------------------- added by zxp for chinese word segment
-	my @segs = split /([A-z|\d]+|\S)/, $text;
-	$text = join " ",@segs;
-	$text =~ s/\s{2,}/ /g;
-	$text =~ s/(^\s|\s$)//g;
-	$text =~ s/\s/\'\'/g;
-	#-------------------- added by zxp end
+    $text = $self->_filterKeywords($text);
 	my ($keywords) = $self->session->db->quickArray("select keywords from assetIndex where assetId=?",[$self->getId]);
 	$self->session->db->write("update assetIndex set keywords =? where assetId=?", [$keywords.' '.$text, $self->getId]);
 }
@@ -122,24 +116,16 @@ sub create {
 	my $asset = shift;
 	my $self = $class->new($asset);
 	$self->delete;
+
 	my $url = $asset->get("url");
 	$url =~ s/\/|\-|\_/ /g;
+
 	my $description = WebGUI::HTML::filter($asset->get('description'), "all");
     my $keywords = join(" ",$asset->get("title"), $asset->get("menuTitle"), $asset->get("synopsis"), $url,
-        $description);
-    $keywords .= WebGUI::Keyword->new($self->session)->getKeywordsForAsset({asset=>$asset});
-	$keywords = WebGUI::HTML::filter($keywords, "all");
+        $description, WebGUI::Keyword->new($self->session)->getKeywordsForAsset({asset=>$asset}));
+    $keywords = $self->_filterKeywords($keywords);
+
 	my $synopsis = $asset->get("synopsis") || substr($description,0,255) || substr($keywords,0,255);
-
-#-------------------- added by zxp for chinese word segment
-	utf8::decode($keywords);
-	my @segs = split /([A-z|\d]+|\S)/, $keywords;
-	$keywords = join " ",@segs;
-	$keywords =~ s/\s{2,}/ /g;
-	$keywords =~ s/(^\s|\s$)//g;
-	$keywords =~ s/\s/\'\'/g;
-#-------------------- added by zxp end
-
 	my $add = $self->session->db->prepare("insert into assetIndex (assetId, title, url, creationDate, revisionDate, 
 		ownerUserId, groupIdView, groupIdEdit, lineage, className, synopsis, keywords) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
 	$add->execute([$asset->getId, $asset->get("title"), $asset->get("url"), $asset->get("creationDate"),
@@ -178,6 +164,33 @@ sub DESTROY {
 
 #-------------------------------------------------------------------
 
+=head2 _filterKeywords ( $keywords )
+
+Perform filtering and cleaning up of the keywords before submitting them.
+
+=head3 $keywords
+
+A string containing keywords.
+
+=cut
+
+sub _filterKeywords {
+	my $self     = shift;
+    my $keywords = shift;
+
+	$keywords = WebGUI::HTML::filter($keywords, "all");
+#-------------------- added by zxp for chinese word segment
+	utf8::decode($keywords);
+	my @segs = split /([A-z|\d]+|\S)/, $keywords;
+	my $newKeywords = join " ",@segs;
+	$newKeywords =~ s/(^\s+|\s+$)//g;
+	$newKeywords =~ s/\s+/\'\'/g;
+#-------------------- added by zxp end
+    return $newKeywords;
+}
+
+#-------------------------------------------------------------------
+
 =head2 getId ( )
 
 Returns the ID used to create this object.