Index: lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
===================================================================
--- lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java	(revision 1091078)
+++ lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java	(working copy)
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -53,7 +54,7 @@
 
   FieldQuery( Query query, boolean phraseHighlight, boolean fieldMatch ){
     this.fieldMatch = fieldMatch;
-    Set<Query> flatQueries = new HashSet<Query>();
+    List<Query> flatQueries = new ArrayList<Query>();
     flatten( query, flatQueries );
     saveTerms( flatQueries );
     Collection<Query> expandQueries = expand( flatQueries );
@@ -113,7 +114,7 @@
    *      => expandQueries={a,"b c","c d","b c d"}
    */
   Collection<Query> expand( Collection<Query> flatQueries ){
-    Set<Query> expandQueries = new HashSet<Query>();
+    List<Query> expandQueries = new ArrayList<Query>();
     for( Iterator<Query> i = flatQueries.iterator(); i.hasNext(); ){
       Query query = i.next();
       i.remove();