Index: apachesolr.module
===================================================================
--- apachesolr.module	(revision 267)
+++ apachesolr.module	(working copy)
@@ -60,6 +60,12 @@
     '#options' => $options,
     '#description' => t('The number of results that will be shown per page.'),
     );
+  $form['apachesolr_include_terms'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Include taxonomy terms in indexed text.'),
+    '#default_value' => variable_get('apachesolr_include_terms', TRUE),
+    '#description' => t('Enabling this option includes all taxonomy terms in the indexed text of a page. Changing this setting will require the index to be rebuilt before changes will appear in search results.'),
+  );
   return system_settings_form($form);
 }
 
@@ -218,12 +224,12 @@
         $node = node_build_content($node, FALSE, FALSE);
         $node->body = drupal_render($node->content);
 
-        $text = check_plain($node->title) .  $node->body;
+        $text = check_plain($node->title) .' '.  $node->body;
 
         // Fetch extra data normally not visible
         $extra = node_invoke_nodeapi($node, 'update index');
         foreach ($extra as $t) {
-          $text .= $t;
+          $text .= ' '. $t;
         }
 
         // Update solr index.
@@ -266,6 +272,8 @@
             }
           }
           if (is_array($node->taxonomy)) {
+            $include_terms = variable_get('apachesolr_include_terms', TRUE);
+            
             foreach ($node->taxonomy as $term) {
               $document->setMultiValue('tid', $term->tid);
               
@@ -275,6 +283,9 @@
               
               $document->setMultiValue('vid', $term->vid);
               $document->setMultiValue('taxonomy_name', $term->name);
+              if ($include_terms) {
+                $text .= ' '. $term->name;
+              }
             }
           }
           $document->text = $text;
Index: apachesolr_search.module
===================================================================
--- apachesolr_search.module	(revision 267)
+++ apachesolr_search.module	(working copy)
@@ -65,6 +65,10 @@
           'facet.sort' => 'true'
         );
         
+        if (isset($_GET['qt'])) {
+            $params['qt'] = $_GET['qt'];
+        }
+        
         foreach (apachesolr_block() as $name => $values) {
           // TODO: Instead of getting this list from apachesolr_block, there
           // should instead be an API function that gets the list FOR apachesolr_block