2 files changed, 18 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/QueryTree.java b/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
index 0655727b46b..6326097d9bd 100644
--- a/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
+++ b/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
@@ -110,6 +110,19 @@ public class QueryTree extends CompositeItem {
     // -------------- Facade
 
     /**
+     * Modifies this query to become the current query RANK with the given item.
+     *
+     * @return the resulting root item in this
+     */
+    public Item withRank(Item item) {
+        var result = new RankItem();
+        result.addItem(getRoot());
+        result.addItem(item);
+        setRoot(result);
+        return result;
+    }
+
+    /**
      * Modifies this query to become the current query AND the given item.
      *
      * @return the resulting root item in this
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java
index d3b166e03d0..0523ca1a7b6 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/DefaultPositionSearcher.java
@@ -56,7 +56,11 @@ public class DefaultPositionSearcher extends Searcher {
         }
         if (useV8GeoPositions && (location != null) && (location.getAttribute() != null)) {
             var geoLoc = new GeoLocationItem(location);
-            query.getModel().getQueryTree().and(geoLoc);
+            if (location.isGeoCircle() && location.degRadius() < 0) {
+                query.getModel().getQueryTree().withRank(geoLoc);
+            } else {
+                query.getModel().getQueryTree().and(geoLoc);
+            }
             location = null;
             query.getRanking().setLocation(location);
         }