diff --git a/src/main/java/io/dashbase/clue/api/DefaultQueryBuilder.java b/src/main/java/io/dashbase/clue/api/DefaultQueryBuilder.java
index 30184aa..7db5186 100644
--- a/src/main/java/io/dashbase/clue/api/DefaultQueryBuilder.java
+++ b/src/main/java/io/dashbase/clue/api/DefaultQueryBuilder.java
@@ -3,6 +3,7 @@
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.Query;
+import io.dashbase.clue.api.NewQueryParser;
 
 public class DefaultQueryBuilder implements QueryBuilder {
 
@@ -11,7 +12,7 @@ public class DefaultQueryBuilder implements QueryBuilder {
   @Override
   public void initialize(String defaultField, Analyzer analyzer)
       throws Exception {
-    parser = new QueryParser(defaultField, analyzer);
+    parser = new NewQueryParser(defaultField, analyzer);
     
   }
 
diff --git a/src/main/java/io/dashbase/clue/api/NewQueryParser.java b/src/main/java/io/dashbase/clue/api/NewQueryParser.java
new file mode 100644
index 0000000..2082032
--- /dev/null
+++ b/src/main/java/io/dashbase/clue/api/NewQueryParser.java
@@ -0,0 +1,12 @@
+package io.dashbase.clue.api;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.queryparser.classic.QueryParser;
+
+public class NewQueryParser extends QueryParser {
+
+        public NewQueryParser(String defaultField, Analyzer analyzer) {
+	    super(defaultField, analyzer);
+	    setAllowLeadingWildcard(true);
+	}
+}