diff --git a/apachesolr.index.inc b/apachesolr.index.inc
index 252c1de..393430e 100644
--- a/apachesolr.index.inc
+++ b/apachesolr.index.inc
@@ -271,9 +271,6 @@ function apachesolr_index_entity_to_documents($item, $env_id) {
     if (empty($document->teaser)) {
       $document->teaser = truncate_utf8($document->content, 300, TRUE);
     }
-
-    // Add additional indexing based on the body of each record.
-    apachesolr_index_add_tags_to_document($document, $document->content);
   }
 
   // Now allow modules to alter each other's additions for maximum flexibility.
@@ -369,7 +366,8 @@ function apachesolr_index_add_tags_to_document(ApacheSolrDocument $document, $te
   ));
 
   // Strip off all ignored tags.
-  $text = strip_tags($text, '<' . implode('><', array_keys($tags_to_index)) . '>');
+  $allowed_tags = '<' . implode('><', array_keys($tags_to_index)) . '>';
+  $text = strip_tags($text, $allowed_tags);
 
   preg_match_all('@<(' . implode('|', array_keys($tags_to_index)) . ')[^>]*>(.*)</\1>@Ui', $text, $matches);
   foreach ($matches[1] as $key => $tag) {
@@ -843,6 +841,9 @@ function apachesolr_index_node_solr_document(ApacheSolrDocument $document, $node
     $document->tos_content_extra = apachesolr_clean_text(implode(' ', $extra));
   }
 
+  // Add additional indexing based on the body of each record.
+  apachesolr_index_add_tags_to_document($document, $text);
+
   //  Generic use case for future reference. Callbacks can
   //  allow you to send back multiple documents
   $documents = array();