STANBOL-654 merging fix into release

git-svn-id: https://svn.apache.org/repos/asf/incubator/stanbol/tags/apache-stanbol-entityhub-0.10.0-incubating@1347552 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java b/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
index fd6e7dc..836add4 100644
--- a/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
+++ b/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/QueryUtils.java
@@ -214,7 +214,7 @@
                             queryElement = queryElement.toLowerCase();
                         }
                         
-                        queryElements.add('"'+queryElement+'"');
+                        queryElements.add(queryElement);
                         lastAdded = offset.startOffset(); //previous token consumed
                         //set to the start of the current token
                         foundWildcard = false;
@@ -223,7 +223,7 @@
                         if(loewercaseWildcardTokens){
                             queryElement = queryElement.toLowerCase();
                         }
-                        queryElements.add('"'+queryElement+'"');
+                        queryElements.add(queryElement);
                         lastAdded = -1; //consume the current token
                         foundWildcard = false;
                     }
@@ -251,7 +251,11 @@
             if(foundWildcard && loewercaseWildcardTokens){
                 queryElement = queryElement.toLowerCase();
             }
-            queryElements.add('"'+queryElement+'"');
+            if(foundWildcard){
+                queryElements.add(queryElement);
+            } else {
+                queryElements.add('"'+queryElement+'"');
+            }
         }
         return queryElements.toArray(new String[queryElements.size()]);
     }