diff --git a/source/net/yacy/search/index/Segment.java b/source/net/yacy/search/index/Segment.java
index 5064fc466..38f39d812 100644
--- a/source/net/yacy/search/index/Segment.java
+++ b/source/net/yacy/search/index/Segment.java
@@ -193,15 +193,14 @@ public class Segment {
         return this.termIndex.getBufferSize();
     }
 
-    public int getQueryCount(String word) {
-        int count = this.termIndex == null ? 0 : this.termIndex.count(Word.word2hash(word));
-        try {count += this.fulltext.getSolr().getQueryCount(YaCySchema.text_t.name() + ':' + word);} catch (IOException e) {}
-        return count;
+    public int getQueryCount(StringBuilder wordsb) {
+        return getQueryCount(wordsb.toString());
     }
 
-    public int getQueryCount(StringBuilder word) {
+    public int getQueryCount(String word) {
+        if (word == null || word.indexOf(':') >= 0 || word.indexOf(' ') >= 0) return 0;
         int count = this.termIndex == null ? 0 : this.termIndex.count(Word.word2hash(word));
-        try {count += this.fulltext.getSolr().getQueryCount(YaCySchema.text_t.name() + ':' + word.toString());} catch (IOException e) {}
+        try {count += this.fulltext.getSolr().getQueryCount(YaCySchema.text_t.name() + ':' + word);} catch (IOException e) {}
         return count;
     }
 
diff --git a/source/net/yacy/search/query/QueryParams.java b/source/net/yacy/search/query/QueryParams.java
index ae6cfc2bf..f9402debb 100644
--- a/source/net/yacy/search/query/QueryParams.java
+++ b/source/net/yacy/search/query/QueryParams.java
@@ -467,7 +467,12 @@ public final class QueryParams {
         return ret;
     }
 
-    final static String[] fields = new String[]{"sku","title","h1_txt","h2_txt","author","description","keywords","text_t"};
+    final static String[] fields = new String[]{
+        YaCySchema.sku.name(),YaCySchema.title.name(),
+        YaCySchema.h1_txt.name(),YaCySchema.h2_txt.name(),
+        YaCySchema.author.name(),YaCySchema.description.name(),
+        YaCySchema.keywords.name(),YaCySchema.text_t.name()
+    };
 
     public String solrQueryString(boolean urlencoded) {
         if (this.query_include_words == null || this.query_include_words.size() == 0) return null;
@@ -486,15 +491,19 @@ public final class QueryParams {
             w.append(s);
             wc++;
         }
+        
+        // combine these queries for all relevant fields
         wc = 0;
         for (String a: fields) {
             if (wc > 0) q.append(urlencoded ? "+OR+" : " OR ");
             q.append('(').append(a).append(':').append(w).append(')');
             wc++;
         }
+        q.insert(0, '(');
+        q.append(')');
 
         // add filter to prevent that results come from failed urls
-        q.append(urlencoded ? "+-failreason_t:[*+TO+*]" : " -failreason_t:[* TO *]");
+        q.append(urlencoded ? "+AND+-failreason_t:[*+TO+*]" : " AND -failreason_t:[* TO *]");
 
         // add constraints
         if ( this.sitehash == null ) {
@@ -506,6 +515,12 @@ public final class QueryParams {
         } else {
             q.append(urlencoded ? "+host_id_s:" : " host_id_s:").append(this.sitehash);
         }
+        String urlMaskPattern = this.urlMask.pattern();
+        int extm = urlMaskPattern.indexOf(".*\\.");
+        if (extm >= 0) {
+            String ext = urlMaskPattern.substring(extm + 4);
+            q.append(urlencoded ? "+AND+url_file_ext_s:" : " AND url_file_ext_s:").append(ext);
+        }
 
         if (this.radius > 0.0d && this.lat != 0.0d && this.lon != 0.0d) {
             // localtion search, no special ranking