Index: contrib/benchmark/conf/highlight-vs-vector-highlight.alg
===================================================================
--- contrib/benchmark/conf/highlight-vs-vector-highlight.alg	(revision 804260)
+++ contrib/benchmark/conf/highlight-vs-vector-highlight.alg	(working copy)
@@ -35,7 +35,7 @@
 docs.file=temp/enwiki-20070527-pages-articles.xml
 
 query.maker=org.apache.lucene.benchmark.byTask.feeds.EnwikiQueryMaker
-#query.maker=org.apache.lucene.benchmark.byTask.feeds.ReutersQueryMaker
+enwikiQueryMaker.disableSpanQueries=true
 
 # task at this depth or less would print when they start
 task.max.depth.log=2
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java	(revision 804260)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java	(working copy)
@@ -127,7 +127,8 @@
 
     List queryList = new ArrayList(20);
     queryList.addAll(Arrays.asList(STANDARD_QUERIES));
-    queryList.addAll(Arrays.asList(getPrebuiltQueries(DocMaker.BODY_FIELD)));
+    if(!config.get("enwikiQueryMaker.disableSpanQueries", false))
+      queryList.addAll(Arrays.asList(getPrebuiltQueries(DocMaker.BODY_FIELD)));
     return createQueries(queryList, anlzr);
   }