diff --git a/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java b/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java
index 2591dc03916..ef61dd373f6 100644
--- a/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java
+++ b/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java
@@ -124,48 +124,50 @@ public class FilterableTermsEnum extends TermsEnum {
 
     @Override
     public boolean seekExact(BytesRef text) throws IOException {
-        boolean found = false;
-        currentDocFreq = NOT_FOUND;
-        currentTotalTermFreq = NOT_FOUND;
         int docFreq = 0;
         long totalTermFreq = 0;
         for (Holder anEnum : enums) {
-            if (!anEnum.termsEnum.seekExact(text)) {
-                continue;
-            }
-            found = true;
-            if (anEnum.bits == null) {
-                docFreq += anEnum.termsEnum.docFreq();
-                if (docsEnumFlag == DocsEnum.FLAG_FREQS) {
-                    long leafTotalTermFreq = anEnum.termsEnum.totalTermFreq();
-                    if (totalTermFreq == -1 || leafTotalTermFreq == -1) {
-                        totalTermFreq = -1;
-                        continue;
-                    }
-                    totalTermFreq += leafTotalTermFreq;
-                }
-            } else {
-                DocsEnum docsEnum = anEnum.docsEnum = anEnum.termsEnum.docs(anEnum.bits, anEnum.docsEnum, docsEnumFlag);
-                // 2 choices for performing same heavy loop - one attempts to calculate totalTermFreq and other does not
-                if (docsEnumFlag == DocsEnum.FLAG_FREQS) {
-                    for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
-                        docFreq++;
-                        // docsEnum.freq() returns 1 if doc indexed with IndexOptions.DOCS_ONLY so no way of knowing if value
-                        // is really 1 or unrecorded when filtering like this
-                        totalTermFreq += docsEnum.freq();
+            if (anEnum.termsEnum.seekExact(text)) {
+                if (anEnum.bits == null) {
+                    docFreq += anEnum.termsEnum.docFreq();
+                    if (docsEnumFlag == DocsEnum.FLAG_FREQS) {
+                        long leafTotalTermFreq = anEnum.termsEnum.totalTermFreq();
+                        if (totalTermFreq == -1 || leafTotalTermFreq == -1) {
+                            totalTermFreq = -1;
+                            continue;
+                        }
+                        totalTermFreq += leafTotalTermFreq;
                     }
                 } else {
-                    for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
-                        // docsEnum.freq() behaviour is undefined if docsEnumFlag==DocsEnum.FLAG_NONE so don't bother with call
-                        docFreq++;
+                    final DocsEnum docsEnum = anEnum.docsEnum = anEnum.termsEnum.docs(anEnum.bits, anEnum.docsEnum, docsEnumFlag);
+                    // 2 choices for performing same heavy loop - one attempts to calculate totalTermFreq and other does not
+                    if (docsEnumFlag == DocsEnum.FLAG_FREQS) {
+                        for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
+                            docFreq++;
+                            // docsEnum.freq() returns 1 if doc indexed with IndexOptions.DOCS_ONLY so no way of knowing if value
+                            // is really 1 or unrecorded when filtering like this
+                            totalTermFreq += docsEnum.freq();
+                        }
+                    } else {
+                        for (int docId = docsEnum.nextDoc(); docId != DocIdSetIterator.NO_MORE_DOCS; docId = docsEnum.nextDoc()) {
+                            // docsEnum.freq() behaviour is undefined if docsEnumFlag==DocsEnum.FLAG_NONE so don't bother with call
+                            docFreq++;
+                        }
                     }
                 }
             }
+        }
+        if (docFreq > 0) {
             currentDocFreq = docFreq;
             currentTotalTermFreq = totalTermFreq;
             current = text;
+            return true;
+        } else {
+            currentDocFreq = NOT_FOUND;
+            currentTotalTermFreq = NOT_FOUND;
+            current = null;
+            return false;
         }
-        return found;
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java b/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java
index 308d84a468e..2c557d4a651 100644
--- a/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java
+++ b/src/main/java/org/elasticsearch/common/lucene/index/FreqTermsEnum.java
@@ -76,22 +76,18 @@ public class FreqTermsEnum extends FilterableTermsEnum implements Releasable {
             boolean found = true;
             if (needDocFreqs) {
                 currentDocFreq = termDocFreqs.get(currentTermOrd);
-                if (currentDocFreq == NOT_FOUND) {
-                    found = false;
-                }
+                found = currentDocFreq != NOT_FOUND;
             }
             if (needTotalTermFreqs) {
                 currentTotalTermFreq = termsTotalFreqs.get(currentTermOrd);
-                if (currentTotalTermFreq == NOT_FOUND) {
-                    found = false;
-                }
+                found = currentTotalTermFreq != NOT_FOUND;
             }
             current = found ? text : null;
             return found;
         }
         
         //Cache miss - gather stats
-        boolean found = super.seekExact(text);        
+        final boolean found = super.seekExact(text);
 
         //Cache the result - found or not. 
         if (needDocFreqs) {