diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java
index 5c8f3793f633b..cee7e96b4a6f6 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchCountAction.java
@@ -73,7 +73,7 @@ protected void sendExecuteFirstPhase(DiscoveryNode node, ShardSearchRequest requ
         @Override
         protected void moveToSecondPhase() throws Exception {
             // no need to sort, since we know we have no hits back
-            final InternalSearchResponse internalResponse = searchPhaseController.merge(SearchPhaseController.EMPTY_DOCS, firstResults, (AtomicArray<? extends FetchSearchResultProvider>) AtomicArray.empty());
+            final InternalSearchResponse internalResponse = searchPhaseController.merge(SearchPhaseController.EMPTY_DOCS, firstResults, (AtomicArray<? extends FetchSearchResultProvider>) AtomicArray.empty(), request);
             String scrollId = null;
             if (request.scroll() != null) {
                 scrollId = buildScrollId(request.searchType(), firstResults, null);
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
index 021f72a1d103c..d2ee973395a1c 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
@@ -180,7 +180,7 @@ void finishHim() {
 
         void innerFinishHim() throws Exception {
             sortedShardList = searchPhaseController.sortDocs(queryFetchResults);
-            final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryFetchResults, queryFetchResults);
+            final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryFetchResults, queryFetchResults, request);
             String scrollId = null;
             if (request.scroll() != null) {
                 scrollId = TransportSearchHelper.buildScrollId(request.searchType(), firstResults, null);
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
index 706f3d0905836..bbefa6a709b5b 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
@@ -289,7 +289,7 @@ void finishHim() {
         }
 
         void innerFinishHim() throws Exception {
-            final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryResults, fetchResults);
+            final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryResults, fetchResults, request);
             String scrollId = null;
             if (request.scroll() != null) {
                 scrollId = TransportSearchHelper.buildScrollId(request.searchType(), firstResults, null);
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java
index aab83aed1d0ad..1c9318de65c80 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java
@@ -86,7 +86,7 @@ protected void moveToSecondPhase() throws Exception {
 
         private void innerFinishHim() throws IOException {
             sortedShardList = searchPhaseController.sortDocs(firstResults);
-            final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, firstResults, firstResults);
+            final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, firstResults, firstResults, request);
             String scrollId = null;
             if (request.scroll() != null) {
                 scrollId = buildScrollId(request.searchType(), firstResults, null);
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
index a3ace10d496f8..983fee82994bf 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
@@ -190,7 +190,7 @@ void finishHim() {
         }
 
         void innerFinishHim() throws Exception {
-            InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, firstResults, fetchResults);
+            InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, firstResults, fetchResults, request);
             String scrollId = null;
             if (request.scroll() != null) {
                 scrollId = TransportSearchHelper.buildScrollId(request.searchType(), firstResults, null);
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java
index 3b289790c647b..79cb584bf7f9c 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScanAction.java
@@ -70,7 +70,7 @@ protected void sendExecuteFirstPhase(DiscoveryNode node, ShardSearchRequest requ
 
         @Override
         protected void moveToSecondPhase() throws Exception {
-            final InternalSearchResponse internalResponse = searchPhaseController.merge(SearchPhaseController.EMPTY_DOCS, firstResults, (AtomicArray<? extends FetchSearchResultProvider>) AtomicArray.empty());
+            final InternalSearchResponse internalResponse = searchPhaseController.merge(SearchPhaseController.EMPTY_DOCS, firstResults, (AtomicArray<? extends FetchSearchResultProvider>) AtomicArray.empty(), request);
             String scrollId = null;
             if (request.scroll() != null) {
                 scrollId = buildScrollId(request.searchType(), firstResults, ImmutableMap.of("total_hits", Long.toString(internalResponse.hits().totalHits())));
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java
index 2da79f230f2de..c1a01ac51f731 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryAndFetchAction.java
@@ -242,7 +242,7 @@ private void finishHim() {
 
         private void innerFinishHim() {
             ScoreDoc[] sortedShardList = searchPhaseController.sortDocs(queryFetchResults);
-            final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryFetchResults, queryFetchResults);
+            final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryFetchResults, queryFetchResults, null);
             String scrollId = null;
             if (request.scroll() != null) {
                 scrollId = request.scrollId();
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java
index b398fab16fcad..3cc249421fc2b 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollQueryThenFetchAction.java
@@ -273,7 +273,7 @@ private void finishHim() {
         }
 
         private void innerFinishHim() {
-            InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryResults, fetchResults);
+            InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryResults, fetchResults, null);
             String scrollId = null;
             if (request.scroll() != null) {
                 scrollId = request.scrollId();
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java
index d2017ab59924f..3275ee37f287e 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchScrollScanAction.java
@@ -260,7 +260,7 @@ private void innerFinishHim() throws IOException {
                     docs[counter++] = scoreDoc;
                 }
             }
-            final InternalSearchResponse internalResponse = searchPhaseController.merge(docs, queryFetchResults, queryFetchResults);
+            final InternalSearchResponse internalResponse = searchPhaseController.merge(docs, queryFetchResults, queryFetchResults, null);
             ((InternalSearchHits) internalResponse.hits()).totalHits = Long.parseLong(this.scrollId.getAttributes().get("total_hits"));
 
 
diff --git a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
index 56eb951a3ecf4..9942855427eb3 100644
--- a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
+++ b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
@@ -25,6 +25,7 @@
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -62,13 +63,16 @@ public class TransportSuggestAction extends TransportBroadcastOperationAction<Su
     private final IndicesService indicesService;
 
     private final SuggestPhase suggestPhase;
+    
+    private final Client client;
 
     @Inject
     public TransportSuggestAction(Settings settings, ThreadPool threadPool, ClusterService clusterService, TransportService transportService,
-                                  IndicesService indicesService, SuggestPhase suggestPhase) {
+                                  IndicesService indicesService, SuggestPhase suggestPhase, Client client) {
         super(settings, threadPool, clusterService, transportService);
         this.indicesService = indicesService;
         this.suggestPhase = suggestPhase;
+        this.client = client;
     }
 
     @Override
@@ -142,7 +146,10 @@ protected SuggestResponse newResponse(SuggestRequest request, AtomicReferenceArr
             }
         }
 
-        return new SuggestResponse(new Suggest(Suggest.reduce(groupedSuggestions)), shardsResponses.length(), successfulShards, failedShards, shardFailures);
+        Suggest.ReduceContext reduceContext = new Suggest.ReduceContext(client, request.indices());
+        reduceContext.setPreference(request.preference());
+        reduceContext.setRouting(request.routing());
+        return new SuggestResponse(new Suggest(Suggest.reduce(groupedSuggestions, reduceContext)), shardsResponses.length(), successfulShards, failedShards, shardFailures);
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/index/query/FilterBuilders.java b/src/main/java/org/elasticsearch/index/query/FilterBuilders.java
index 186f676d8cf39..dea83cf7de683 100644
--- a/src/main/java/org/elasticsearch/index/query/FilterBuilders.java
+++ b/src/main/java/org/elasticsearch/index/query/FilterBuilders.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.index.query;
 
 import org.elasticsearch.common.Nullable;
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.geo.ShapeRelation;
 import org.elasticsearch.common.geo.builders.ShapeBuilder;
@@ -553,6 +554,10 @@ public static WrapperFilterBuilder wrapperFilter(String filter) {
     public static WrapperFilterBuilder wrapperFilter(byte[] data, int offset, int length) {
         return new WrapperFilterBuilder(data, offset, length);
     }
+    
+    public static WrapperFilterBuilder wrapperFilter(BytesReference bytes) {
+        return new WrapperFilterBuilder(bytes);
+    }
 
     private FilterBuilders() {
 
diff --git a/src/main/java/org/elasticsearch/index/query/WrapperFilterBuilder.java b/src/main/java/org/elasticsearch/index/query/WrapperFilterBuilder.java
index dc2253d650e02..85d5902cba1b4 100644
--- a/src/main/java/org/elasticsearch/index/query/WrapperFilterBuilder.java
+++ b/src/main/java/org/elasticsearch/index/query/WrapperFilterBuilder.java
@@ -25,7 +25,8 @@
  * Time: 11:30
  */
 
-import com.google.common.base.Charsets;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -36,27 +37,24 @@
  * query builders.
  */
 public class WrapperFilterBuilder extends BaseFilterBuilder {
-
-    private final byte[] source;
-    private final int offset;
-    private final int length;
+    private final BytesReference bytes;
 
     public WrapperFilterBuilder(String source) {
-        this.source = source.getBytes(Charsets.UTF_8);
-        this.offset = 0;
-        this.length = this.source.length;
+        this(new BytesArray(source));
     }
 
     public WrapperFilterBuilder(byte[] source, int offset, int length) {
-        this.source = source;
-        this.offset = offset;
-        this.length = length;
+        this(new BytesArray(source, offset, length));
+    }
+    
+    public WrapperFilterBuilder(BytesReference bytes) {
+        this.bytes = bytes;
     }
 
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject(WrapperFilterParser.NAME);
-        builder.field("filter", source, offset, length);
+        builder.field("filter", bytes);
         builder.endObject();
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java b/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
index c939817a79644..fafd5abb74b70 100644
--- a/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
+++ b/src/main/java/org/elasticsearch/search/controller/SearchPhaseController.java
@@ -23,7 +23,9 @@
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.*;
 import org.apache.lucene.util.PriorityQueue;
+import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.cache.recycler.CacheRecycler;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.common.collect.XMaps;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
@@ -66,12 +68,14 @@ public int compare(AtomicArray.Entry<? extends QuerySearchResultProvider> o1, At
 
     private final CacheRecycler cacheRecycler;
     private final boolean optimizeSingleShard;
+    private final Client client;
 
     @Inject
-    public SearchPhaseController(Settings settings, CacheRecycler cacheRecycler) {
+    public SearchPhaseController(Settings settings, CacheRecycler cacheRecycler, Client client) {
         super(settings);
         this.cacheRecycler = cacheRecycler;
         this.optimizeSingleShard = componentSettings.getAsBoolean("optimize_single_shard", true);
+        this.client = client;
     }
 
     public boolean optimizeSingleShard() {
@@ -296,7 +300,7 @@ public void fillDocIdsToLoad(AtomicArray<ExtTIntArrayList> docsIdsToLoad, ScoreD
         }
     }
 
-    public InternalSearchResponse merge(ScoreDoc[] sortedDocs, AtomicArray<? extends QuerySearchResultProvider> queryResultsArr, AtomicArray<? extends FetchSearchResultProvider> fetchResultsArr) {
+    public InternalSearchResponse merge(ScoreDoc[] sortedDocs, AtomicArray<? extends QuerySearchResultProvider> queryResultsArr, AtomicArray<? extends FetchSearchResultProvider> fetchResultsArr, SearchRequest request) {
 
         List<? extends AtomicArray.Entry<? extends QuerySearchResultProvider>> queryResults = queryResultsArr.asList();
         List<? extends AtomicArray.Entry<? extends FetchSearchResultProvider>> fetchResults = fetchResultsArr.asList();
@@ -411,7 +415,14 @@ public InternalSearchResponse merge(ScoreDoc[] sortedDocs, AtomicArray<? extends
                 Suggest.group(groupedSuggestions, shardResult);
             }
 
-            suggest = hasSuggestions ? new Suggest(Suggest.Fields.SUGGEST, Suggest.reduce(groupedSuggestions)) : null;
+            Suggest.ReduceContext reduceContext = null;
+            if (request != null) {
+                reduceContext = new Suggest.ReduceContext(client, request.indices());
+                reduceContext.setPreference(request.preference());
+                reduceContext.setRouting(request.routing());
+                reduceContext.setTypes(request.types());
+            }
+            suggest = hasSuggestions ? new Suggest(Suggest.Fields.SUGGEST, Suggest.reduce(groupedSuggestions, reduceContext)) : null;
         }
 
         InternalSearchHits searchHits = new InternalSearchHits(hits.toArray(new InternalSearchHit[hits.size()]), totalHits, maxScore);
diff --git a/src/main/java/org/elasticsearch/search/suggest/Suggest.java b/src/main/java/org/elasticsearch/search/suggest/Suggest.java
index 1776dadd4c511..93820b32cab44 100644
--- a/src/main/java/org/elasticsearch/search/suggest/Suggest.java
+++ b/src/main/java/org/elasticsearch/search/suggest/Suggest.java
@@ -21,6 +21,9 @@
 import org.apache.lucene.util.CollectionUtil;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.Version;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.common.Nullable;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
@@ -176,11 +179,12 @@ public static Map<String, List<Suggest.Suggestion>> group(Map<String, List<Sugge
         return groupedSuggestions;
     }
 
-    public static List<Suggestion<? extends Entry<? extends Option>>> reduce(Map<String, List<Suggest.Suggestion>> groupedSuggestions) {
+    public static List<Suggestion<? extends Entry<? extends Option>>> reduce(Map<String, List<Suggest.Suggestion>> groupedSuggestions, ReduceContext context) {
         List<Suggestion<? extends Entry<? extends Option>>> reduced = new ArrayList<Suggestion<? extends Entry<? extends Option>>>(groupedSuggestions.size());
         for (java.util.Map.Entry<String, List<Suggestion>> unmergedResults : groupedSuggestions.entrySet()) {
             List<Suggestion> value = unmergedResults.getValue();
             Suggestion reduce = value.get(0).reduce(value);
+            reduce.filter(context);
             reduce.trim();
             reduced.add(reduce);
         }
@@ -265,7 +269,14 @@ public Suggestion<T> reduce(List<Suggestion<T>> toReduce) {
         protected Comparator<Option> sortComparator() {
             return COMPARATOR;
         }
-        
+
+        /**
+         * Filter options after they've been reduced.
+         */
+        protected void filter(ReduceContext context) {
+            // Default implementation is noop
+        }
+
         /**
          * Trims the number of options per suggest text term to the requested size.
          * For internal usage.
@@ -647,4 +658,51 @@ public static Sort fromId(byte id) {
             }
         }
     }
+    
+    public static class ReduceContext {
+        private final Client client;
+        private final String[] indecies;
+        @Nullable
+        private String routing;
+        @Nullable
+        private String preference;
+        private String[] types = Strings.EMPTY_ARRAY;
+        
+        public ReduceContext(Client client, String[] indecies) {
+            this.client = client;
+            this.indecies = indecies;
+        }
+        
+        public Client getClient() {
+            return client;
+        }
+        
+        public String[] getIndecies() {
+            return indecies;
+        }
+        
+        public void setRouting(String routing) {
+            this.routing = routing;
+        }
+        
+        public String getRouting() {
+            return routing;
+        }
+        
+        public void setPreference(String preference) {
+            this.preference = preference;
+        }
+        
+        public String getPreference() {
+            return preference;
+        }
+        
+        public void setTypes(String[] types) {
+            this.types = types;
+        }
+        
+        public String[] getTypes() {
+            return types;
+        }
+    }
 }
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
index 6aaf3a50c11d6..9c9ff07283686 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
@@ -23,6 +23,8 @@
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.index.analysis.ShingleTokenFilterFactory;
@@ -46,7 +48,8 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma
         PhraseSuggestionContext suggestion = new PhraseSuggestionContext(suggester);
         XContentParser.Token token;
         String fieldName = null;
-        boolean gramSizeSet = false; 
+        boolean gramSizeSet = false;
+        boolean filterTypeSet = false;
         while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
             if (token == XContentParser.Token.FIELD_NAME) {
                 fieldName = parser.currentName();
@@ -124,6 +127,25 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma
                             }
                         }
                     }
+                } else if ("filter".equals(fieldName)) {
+                    while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+                        if (token == XContentParser.Token.FIELD_NAME) {
+                            fieldName = parser.currentName();
+                        } else if (token.isValue()) {
+                            if ("type".equals(fieldName)) {
+                                suggestion.setFilterType(PhraseSuggestion.FilterType.fromString(parser.text()));
+                                filterTypeSet = true;
+                            } else if ("extra".equals(fieldName)) {
+                                // Copy the filter data
+                                XContentBuilder copier = XContentFactory.contentBuilder(parser.contentType());
+                                copier.copyCurrentStructure(parser);
+                                suggestion.setFilterExtra(copier.bytes());
+                            } else {
+                                throw new ElasticSearchIllegalArgumentException(
+                                    "suggester[phrase][highlight] doesn't support field [" + fieldName + "]");
+                            }
+                        }
+                    }
                 } else {
                     throw new ElasticSearchIllegalArgumentException("suggester[phrase]  doesn't support array field [" + fieldName + "]");
                 }
@@ -166,7 +188,10 @@ public SuggestionSearchContext.SuggestionContext parse(XContentParser parser, Ma
             }
         }
         
-        
+        // filterType defaults to PHRASE if filterExtra is set but it isn't
+        if (!filterTypeSet && suggestion.getFilterExtra().length() > 0) {
+            suggestion.setFilterType(PhraseSuggestion.FilterType.MATCH_PHRASE);
+        }
         
         return suggestion;
     }
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
index d827ba300d98e..e1b9d23f9eb9f 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
@@ -55,6 +55,9 @@ public Suggestion<? extends Entry<? extends Option>> innerExecute(String name, P
             IndexReader indexReader, CharsRef spare) throws IOException {
         double realWordErrorLikelihood = suggestion.realworldErrorLikelyhood();
         final PhraseSuggestion response = new PhraseSuggestion(name, suggestion.getSize());
+        response.setFilterType(suggestion.getFilterType());
+        response.setFilterExtra(suggestion.getFilterExtra());
+        response.setField(new StringText(suggestion.getField()));
 
         List<PhraseSuggestionContext.DirectCandidateGenerator>  generators = suggestion.generators();
         final int numGenerators = generators.size();
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java
index 82b59a1a715b9..4fcd60ee31c21 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestion.java
@@ -19,15 +19,32 @@
 
 package org.elasticsearch.search.suggest.phrase;
 
+import org.elasticsearch.ElasticSearchIllegalArgumentException;
 import org.elasticsearch.Version;
+import org.elasticsearch.action.search.MultiSearchRequestBuilder;
+import org.elasticsearch.action.search.MultiSearchResponse;
+import org.elasticsearch.action.search.SearchRequestBuilder;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
+import org.elasticsearch.index.query.BoolFilterBuilder;
+import org.elasticsearch.index.query.FilterBuilder;
+import org.elasticsearch.index.query.MatchQueryBuilder;
+import org.elasticsearch.index.query.MatchQueryBuilder.Operator;
 import org.elasticsearch.search.suggest.Suggest;
+import org.elasticsearch.search.suggest.Suggest.ReduceContext;
 import org.elasticsearch.search.suggest.Suggest.Suggestion;
+import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry.Option;
 
 import java.io.IOException;
+import java.util.Iterator;
+
+import static org.elasticsearch.index.query.FilterBuilders.*;
+import static org.elasticsearch.index.query.QueryBuilders.*;
 
 /**
  * Suggestion entry returned from the {@link PhraseSuggester}.
@@ -35,12 +52,118 @@
 public class PhraseSuggestion extends Suggest.Suggestion<PhraseSuggestion.Entry> {
     public static final int TYPE = 3;
 
+    /**
+     * Field against which suggestion was generated.
+     */
+    private Text field;
+    /**
+     * Type of filter to apply to suggestions. null is invalid.
+     */
+    private FilterType filterType = FilterType.NONE;
+    /**
+     * Extra filter to apply to suggestions. a zero length reference means none.
+     */
+    private BytesReference filterExtra = BytesArray.EMPTY;
+    
     public PhraseSuggestion() {
     }
 
     public PhraseSuggestion(String name, int size) {
         super(name, size);
     }
+    
+    public void setField(Text field) {
+        this.field = field;
+    }
+    
+    public Text getField() {
+        return this.field;
+    }
+    
+    public void setFilterType(FilterType filterType) {
+        this.filterType = filterType;
+    }
+    
+    public FilterType getFilterType() {
+        return filterType;
+    }
+    
+    public void setFilterExtra(BytesReference filterExtra) {
+        this.filterExtra = filterExtra;
+    }
+    
+    public BytesReference getFilterExtra() {
+        return filterExtra;
+    }
+    
+    @Override
+    protected void filter(ReduceContext context) {
+        // Don't filter if it wasn't asked for or if the search context doesn't support it.
+        if (filterType == FilterType.NONE || context == null) {
+            return;
+        }
+        FilterBuilder filterExtraBuilder = null;
+        if (filterExtra.length() > 0) {
+            filterExtraBuilder = wrapperFilter(filterExtra);
+        }
+        SearchRequestBuilder searchRequest = context.getClient().prepareSearch(context.getIndecies());
+        searchRequest.setTypes(context.getTypes());
+        searchRequest.setRouting(context.getRouting());
+        searchRequest.setPreference(context.getPreference());
+        searchRequest.setNoFields();
+        searchRequest.setFrom(0);
+        searchRequest.setSize(1);
+        searchRequest.setQuery(matchAllQuery());
+        String fieldString = field.string();
+        for (Entry entry: this.getEntries()) {
+            MultiSearchRequestBuilder multi = context.getClient().prepareMultiSearch();
+            for (Option option: entry.getOptions()) {
+                MatchQueryBuilder optionQueryBuilder;
+                switch (filterType) {
+                case MATCH_PHRASE:
+                    optionQueryBuilder = matchPhraseQuery(fieldString, option.getText());
+                    break;
+                case MATCH_AND:
+                    optionQueryBuilder = matchQuery(fieldString, option.getText());
+                    optionQueryBuilder.operator(Operator.AND);
+                    break;
+                case MATCH_OR:
+                    optionQueryBuilder = matchQuery(fieldString, option.getText());
+                    optionQueryBuilder.operator(Operator.OR);
+                    break;
+                default:
+                    throw new ElasticSearchIllegalArgumentException("Unknown filter type:  " + filterType);
+                }
+                FilterBuilder optionFilterBuilder = queryFilter(optionQueryBuilder);
+                if (filterExtraBuilder == null) {
+                    searchRequest.setFilter(optionFilterBuilder);
+                } else {
+                    BoolFilterBuilder searchFilter = boolFilter();
+                    searchFilter.must(filterExtraBuilder);
+                    searchFilter.must(optionFilterBuilder);
+                    searchRequest.setFilter(searchFilter);    
+                }
+                System.err.println(searchRequest);
+                // Force building the searchRequest right now because we reuse the builder for the next option
+                multi.add(searchRequest.request());
+            }
+            MultiSearchResponse multiResponse = multi.get("10s"); // TODO timeout and exception handling
+            int responseIndex = 0;
+            Iterator<? extends Option> itr = entry.getOptions().iterator();
+            while (itr.hasNext()) {
+                Option option = itr.next();
+                SearchResponse response = multiResponse.getResponses()[responseIndex++].getResponse();
+                System.err.println(response);
+                if (response.getHits().getTotalHits() < 1) {
+                    System.err.println("Removing " + option.getText());
+                    itr.remove();
+                }
+                // TODO stop early when we're sure we have enough results
+                // TODO don't just launch all the requests at once?
+                // TODO allow the user to limit the maximum number of of results to try to filter
+            }
+        }
+    }
 
     @Override
     public int getType() {
@@ -51,6 +174,32 @@ public int getType() {
     protected Entry newEntry() {
         return new Entry();
     }
+    
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        // If the other side is older than 0.90.4 then it shouldn't be sending suggestions of this type but just in case
+        // we're going to assume that they are regular suggestions so we won't read anything.
+        if (in.getVersion().before(Version.V_0_90_4)) {
+            return;
+        }
+        field = in.readText();
+        filterType = FilterType.fromValue(in.readByte());
+        filterExtra = in.readBytesReference();
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        // If the other side of the message is older than 0.90.4 it'll interpret these suggestions as regular suggestions
+        // so we have to pretend to be one which we can do by just calling the superclass writeTo and doing nothing else
+        if (out.getVersion().before(Version.V_0_90_4)) {
+            return;
+        }
+        out.writeText(field);
+        out.writeByte(filterType.getValue());
+        out.writeBytesReference(filterExtra);
+    }
 
     public static class Entry extends Suggestion.Entry<Suggestion.Entry.Option> {
         static class Fields {
@@ -117,4 +266,44 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeDouble(cutoffScore);
         }
     }
+    
+    public static enum FilterType {
+        NONE((byte) 0),
+        MATCH_PHRASE((byte) 1),
+        MATCH_OR((byte) 2),
+        MATCH_AND((byte) 3);
+        
+        private byte value;
+        
+        private FilterType(byte value) {
+            this.value = value;
+        }
+        
+        public byte getValue() {
+            return value;
+        }
+        
+        public static FilterType fromValue(byte value) {
+            switch(value) {
+            case 0: return NONE;
+            case 1: return MATCH_PHRASE;
+            case 2: return MATCH_OR;
+            case 3: return MATCH_AND;
+            }
+            throw new ElasticSearchIllegalArgumentException("filter type [" + value + "] not valid, can be one of [0|1|2|3]");
+        }
+        
+        public static FilterType fromString(String filterType) throws ElasticSearchIllegalArgumentException {
+            if ("none".equalsIgnoreCase(filterType)) {
+                return NONE;
+            } else if ("match_phrase".equalsIgnoreCase(filterType) || "matchPhrase".equalsIgnoreCase(filterType)) {
+                return MATCH_PHRASE;
+            } else if ("match_or".equalsIgnoreCase(filterType) || "matchOr".equalsIgnoreCase(filterType)) {
+                return MATCH_OR;
+            } else if ("match_and".equalsIgnoreCase(filterType) || "matchAnd".equalsIgnoreCase(filterType)) {
+                return MATCH_AND;
+            }
+            throw new ElasticSearchIllegalArgumentException("filter type [" + filterType + "] not valid, can be one of [none|match_phrase|matchPhrase|match_or|matchOr|match_and|matchAnd]");
+        }
+    }
 }
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
index a99a273ee9ee3..1b05e2a169f93 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
@@ -21,7 +21,9 @@
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.query.FilterBuilder;
 import org.elasticsearch.search.suggest.SuggestBuilder.SuggestionBuilder;
+import org.elasticsearch.search.suggest.phrase.PhraseSuggestion.FilterType;
 
 import java.io.IOException;
 import java.util.*;
@@ -42,6 +44,8 @@ public final class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSugge
     private Integer tokenLimit;
     private String preTag;
     private String postTag;
+    private FilterType filterType;
+    private FilterBuilder filterExtra;
 
     public PhraseSuggestionBuilder(String name) {
         super(name, "phrase");
@@ -148,7 +152,7 @@ public PhraseSuggestionBuilder smoothingModel(SmoothingModel model) {
         return this;
     }
     
-    public PhraseSuggestionBuilder tokenLimit(int tokenLimit) {
+    public PhraseSuggestionBuilder tokenLimit(Integer tokenLimit) {
         this.tokenLimit = tokenLimit;
         return this;
     }
@@ -165,6 +169,16 @@ public PhraseSuggestionBuilder highlight(String preTag, String postTag) {
         this.postTag = postTag;
         return this;
     }
+    
+    public PhraseSuggestionBuilder filterType(FilterType filterType) {
+        this.filterType = filterType;
+        return this;
+    }
+    
+    public PhraseSuggestionBuilder filterExtra(FilterBuilder filterExtra) {
+        this.filterExtra = filterExtra;
+        return this;
+    }
 
     @Override
     public XContentBuilder innerToXContent(XContentBuilder builder, Params params) throws IOException {
@@ -210,6 +224,17 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t
             builder.field("post_tag", postTag);
             builder.endObject();
         }
+        if (filterType != null || filterExtra != null) {
+            builder.startObject("filter");
+            if (filterType != null) {
+                builder.field("type", filterType.name().toLowerCase(Locale.US));
+            }
+            if (filterExtra != null) {
+                builder.field("extra");
+                filterExtra.toXContent(builder, params);
+            }
+            builder.endObject();
+        }
         return builder;
     }
 
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
index 18ed6d15dc7ec..b4cb041bc8a40 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
@@ -18,15 +18,18 @@
  */
 package org.elasticsearch.search.suggest.phrase;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.search.suggest.DirectSpellcheckerSettings;
 import org.elasticsearch.search.suggest.Suggester;
 import org.elasticsearch.search.suggest.SuggestionSearchContext.SuggestionContext;
+import org.elasticsearch.search.suggest.phrase.PhraseSuggestion.FilterType;
+
+import java.util.ArrayList;
+import java.util.List;
 
 class PhraseSuggestionContext extends SuggestionContext {
     private final BytesRef SEPARATOR = new BytesRef(" ");
@@ -40,6 +43,14 @@ class PhraseSuggestionContext extends SuggestionContext {
     private int tokenLimit = NoisyChannelSpellChecker.DEFAULT_TOKEN_LIMIT;
     private BytesRef preTag;
     private BytesRef postTag;
+    /**
+     * Type of filter to apply to suggestions. null is invalid.
+     */
+    private FilterType filterType = FilterType.NONE;
+    /**
+     * Extra filter to apply to suggestions. a zero length reference means none.
+     */
+    private BytesReference filterExtra = BytesArray.EMPTY;
 
     private WordScorer.WordScorerFactory scorer;
 
@@ -180,4 +191,20 @@ public void setPostTag(BytesRef postTag) {
     public BytesRef getPostTag() {
         return postTag;
     }
+
+    public PhraseSuggestion.FilterType getFilterType() {
+        return filterType;
+    }
+
+    public void setFilterType(PhraseSuggestion.FilterType filterType) {
+        this.filterType = filterType;
+    }
+
+    public BytesReference getFilterExtra() {
+        return filterExtra;
+    }
+
+    public void setFilterExtra(BytesReference filterExtra) {
+        this.filterExtra = filterExtra;
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
index 472d32d2abdcb..bffe323479e3f 100644
--- a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
+++ b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
@@ -22,6 +22,7 @@
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.elasticsearch.AbstractSharedClusterTest;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
 import org.elasticsearch.action.search.SearchPhaseExecutionException;
@@ -32,11 +33,11 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.search.suggest.SuggestBuilder.SuggestionBuilder;
+import org.elasticsearch.search.suggest.phrase.PhraseSuggestion.FilterType;
 import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder;
 import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder.DirectCandidateGenerator;
 import org.elasticsearch.search.suggest.term.TermSuggestionBuilder;
 import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
-import org.elasticsearch.AbstractSharedClusterTest;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -46,6 +47,7 @@
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
+import static org.elasticsearch.index.query.FilterBuilders.prefixFilter;
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.elasticsearch.search.suggest.SuggestBuilder.phraseSuggestion;
 import static org.elasticsearch.search.suggest.SuggestBuilder.termSuggestion;
@@ -519,6 +521,40 @@ public void testMarvelHerosPhraseSuggest() throws ElasticSearchException, IOExce
         assertSuggestion(searchSuggest, 0, "simple_phrase", "xorr the god jewel xorr the god jewel xorr the god jewel");
         // Check the name this time because we're repeating it which is funky
         assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().get(0).getText().string(), equalTo("Xor the Got-Jewel Xor the Got-Jewel Xor the Got-Jewel"));
+
+        // You can filter the results to just phrases that exist
+        phraseSuggest.tokenLimit(null).smoothingModel(null).filterType(FilterType.MATCH_PHRASE);
+        searchSuggest = searchSuggest(client(), "more power borker", phraseSuggest);
+        assertSuggestionSize(searchSuggest, 0, 0, "simple_phrase");
+        searchSuggest = searchSuggest(client(), "power borker", phraseSuggest);
+        assertSuggestion(searchSuggest, 0, "simple_phrase", "power broker");
+        
+        // Or you can filter results to just those that would pass a match query with the operator set to or
+        phraseSuggest.filterType(FilterType.MATCH_OR);
+        searchSuggest = searchSuggest(client(), "more power borker", phraseSuggest);
+        assertSuggestion(searchSuggest, 0, "simple_phrase", "more power broker");
+        searchSuggest = searchSuggest(client(), "power borker", phraseSuggest);
+        assertSuggestion(searchSuggest, 0, "simple_phrase", "power broker");
+        
+        // And you can ask for an and filter as well
+        phraseSuggest.filterType(FilterType.MATCH_AND);
+        searchSuggest = searchSuggest(client(), "more power borker", phraseSuggest);
+        assertSuggestionSize(searchSuggest, 0, 0, "simple_phrase");
+        searchSuggest = searchSuggest(client(), "power borker", phraseSuggest);
+        assertSuggestion(searchSuggest, 0, "simple_phrase", "power broker");
+
+        // Adding an extra filter will only produce suggestions that find results using that filter
+        phraseSuggest.filterType(FilterType.MATCH_PHRASE).filterExtra(prefixFilter("body", "power"));
+        searchSuggest = searchSuggest(client(), "power borker", phraseSuggest);
+        assertSuggestion(searchSuggest, 0, "simple_phrase", "power broker");
+        phraseSuggest.filterType(FilterType.MATCH_PHRASE).filterExtra(prefixFilter("body", "king"));
+        searchSuggest = searchSuggest(client(), "power borker", phraseSuggest);
+        assertSuggestionSize(searchSuggest, 0, 0, "simple_phrase");
+
+        // If you do not specify a filter type but specify filter_extra then PHRASE is the default
+        phraseSuggest.filterType(null).filterExtra(prefixFilter("body", "power"));
+        searchSuggest = searchSuggest(client(), "more power borker", phraseSuggest);
+        assertSuggestionSize(searchSuggest, 0, 0, "simple_phrase");
     }
     
     @Test