diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml
index 3c66821..8da24f2 100644
--- a/solr/conf/schema.xml
+++ b/solr/conf/schema.xml
@@ -60,12 +60,17 @@
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="text" class="solr.TextField" omitNorms="false">
-      <analyzer>
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
-  <filter class="solr.NGramFilterFactory" maxgramsize="25" mingramsize="3"/>
+      <analyzer type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.SnowballPorterFilterFactory"/>
+        <filter class="solr.NGramFilterFactory" minGramSize="2" maxGramSize="30"/>
+        <filter class="solr.TrimFilterFactory" />
+        <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="30"/>
+      </analyzer>
+      <analyzer type="query">
+	<tokenizer class="solr.WhitespaceTokenizerFactory"/>
+	<filter class="solr.LowerCaseFilterFactory"/>
+	<filter class="solr.TrimFilterFactory" />
       </analyzer>
     </fieldType>
     <!-- *** This fieldType is used by Sunspot! *** -->