diff --git a/solr-conf/1.4/solrconfig.xml b/solr-conf/1.4/solrconfig.xml
index a1f7698..d989990 100644
--- a/solr-conf/1.4/solrconfig.xml
+++ b/solr-conf/1.4/solrconfig.xml
@@ -880,6 +880,14 @@
     </lst>
   </requestHandler>
 
+  <!-- A minimal query type for doing luene queries -->
+  <requestHandler name="standard" class="solr.SearchHandler">
+    <lst name="defaults">
+      <str name="echoParams">explicit</str>
+      <bool name="omitHeader">true</bool>
+    </lst>
+  </requestHandler>
+
   <!-- XML Update Request Handler.
 
        http://wiki.apache.org/solr/UpdateXmlMessages
@@ -1360,8 +1368,8 @@
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
-          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-          <str name="hl.simple.post"><![CDATA[</em>]]></str>
+          <str name="hl.simple.pre"><![CDATA[<strong>]]></str>
+          <str name="hl.simple.post"><![CDATA[</strong>]]></str>
         </lst>
       </formatter>
 
@@ -1595,32 +1603,4 @@
     </xi:fallback>
   </xi:include>
 
-  <queryConverter name="queryConverter" class="solr.SpellingQueryConverter"/>
-
-  <!-- Following is a dynamic way to include other components or any customized solrconfig.xml stuff, added by other contrib modules -->
-  <xi:include href="solr/conf/solrconfig_extra.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:fallback>
-      <!-- Spell Check
-
-          The spell check component can return a list of alternative spelling
-          suggestions. This component must be defined in
-          solrconfig_extra.xml if present, since it's used in the search handler.
-
-          http://wiki.apache.org/solr/SpellCheckComponent
-       -->
-      <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-        <str name="queryAnalyzerFieldType">textSpell</str>
-
-        <!-- a spellchecker built from a field of the main index -->
-        <lst name="spellchecker">
-          <str name="name">default</str>
-          <str name="field">content</str>
-          <str name="spellcheckIndexDir">spellchecker</str>
-          <str name="buildOnOptimize">true</str>
-        </lst>
-      </searchComponent>
-    </xi:fallback>
-  </xi:include>
-
 </config>
diff --git a/solr-conf/3.x/solrconfig.xml b/solr-conf/3.x/solrconfig.xml
index 3046b3b..cb5811c 100644
--- a/solr-conf/3.x/solrconfig.xml
+++ b/solr-conf/3.x/solrconfig.xml
@@ -888,6 +888,14 @@
     </lst>
   </requestHandler>
 
+  <!-- A minimal query type for doing luene queries -->
+  <requestHandler name="standard" class="solr.SearchHandler">
+    <lst name="defaults">
+      <str name="echoParams">explicit</str>
+      <bool name="omitHeader">true</bool>
+    </lst>
+  </requestHandler>
+
   <!-- XML Update Request Handler.
 
        http://wiki.apache.org/solr/UpdateXmlMessages
@@ -1368,8 +1376,8 @@
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
-          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-          <str name="hl.simple.post"><![CDATA[</em>]]></str>
+          <str name="hl.simple.pre"><![CDATA[<strong>]]></str>
+          <str name="hl.simple.post"><![CDATA[</strong>]]></str>
         </lst>
       </formatter>
 
diff --git a/solr-conf/4.x/solrconfig.xml b/solr-conf/4.x/solrconfig.xml
index 355f471..47e5b96 100644
--- a/solr-conf/4.x/solrconfig.xml
+++ b/solr-conf/4.x/solrconfig.xml
@@ -880,6 +880,14 @@
     </lst>
   </requestHandler>
 
+  <!-- A minimal query type for doing luene queries -->
+  <requestHandler name="standard" class="solr.SearchHandler">
+    <lst name="defaults">
+      <str name="echoParams">explicit</str>
+      <bool name="omitHeader">true</bool>
+    </lst>
+  </requestHandler>
+
   <!-- XML Update Request Handler.
 
        http://wiki.apache.org/solr/UpdateXmlMessages
@@ -1360,8 +1368,8 @@
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
-          <str name="hl.simple.pre"><![CDATA[<em>]]></str>
-          <str name="hl.simple.post"><![CDATA[</em>]]></str>
+          <str name="hl.simple.pre"><![CDATA[<strong>]]></str>
+          <str name="hl.simple.post"><![CDATA[</strong>]]></str>
         </lst>
       </formatter>
 
diff --git a/solr-conf/4.x/solrconfig_extra.xml b/solr-conf/4.x/solrconfig_extra.xml
index 5ce04b8..4b4873a 100644
--- a/solr-conf/4.x/solrconfig_extra.xml
+++ b/solr-conf/4.x/solrconfig_extra.xml
@@ -20,6 +20,7 @@
   <str name="name">default</str>
   <str name="field">content</str>
   <str name="spellcheckIndexDir">spellchecker</str>
+  <str name="buildOnOptimize">true</str>
   <!-- uncomment this to require terms to occur in 1% of the documents in order to be included in the dictionary
     <float name="thresholdTokenFrequency">.01</float>
   -->