diff --git a/SeforimMagicIndexer b/SeforimMagicIndexer
index 147b3a7b..a5a0245b 160000
--- a/SeforimMagicIndexer
+++ b/SeforimMagicIndexer
@@ -1 +1 @@
-Subproject commit 147b3a7b2fdabd579e3b0cf0adc6733a3be064eb
+Subproject commit a5a0245bdac17cbe1bf4032621031f93a55f7362
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 3250fa53..56376722 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -11,7 +11,7 @@ group = "io.github.kdroidfilter.seforimlibrary"
 kotlin {
     jvmToolchain(libs.versions.jvmToolchain.get().toInt())
 
-    androidLibrary {
+    android {
         namespace = "io.github.kdroidfilter.seforimlibrary"
         compileSdk = 35
         minSdk = 21
diff --git a/dao/build.gradle.kts b/dao/build.gradle.kts
index efff270f..2d591ba1 100644
--- a/dao/build.gradle.kts
+++ b/dao/build.gradle.kts
@@ -13,7 +13,7 @@ group = "io.github.kdroidfilter.seforimlibrary"
 kotlin {
     jvmToolchain(libs.versions.jvmToolchain.get().toInt())
 
-    androidLibrary {
+    android {
         namespace = "io.github.kdroidfilter.seforimlibrary"
         compileSdk = 35
         minSdk = 21
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 65f06001..e5a2909e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 
 filekitCore = "0.13.0"
 kotlin = "2.3.20"
-agp = "8.12.3"
+agp = "9.1.1"
 jvmToolchain = "25"
 lucene = "10.4.0"
 onnxruntime = "1.20.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e111328..299848b1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/search/src/jvmMain/kotlin/io/github/kdroidfilter/seforimlibrary/search/LuceneSearchEngine.kt b/search/src/jvmMain/kotlin/io/github/kdroidfilter/seforimlibrary/search/LuceneSearchEngine.kt
index eb85e842..4901a34c 100644
--- a/search/src/jvmMain/kotlin/io/github/kdroidfilter/seforimlibrary/search/LuceneSearchEngine.kt
+++ b/search/src/jvmMain/kotlin/io/github/kdroidfilter/seforimlibrary/search/LuceneSearchEngine.kt
@@ -15,6 +15,7 @@ import org.apache.lucene.search.BooleanClause
 import org.apache.lucene.search.BooleanQuery
 import org.apache.lucene.search.BoostQuery
 import org.apache.lucene.search.Collector
+import org.apache.lucene.search.CollectorManager
 import org.apache.lucene.search.FuzzyQuery
 import org.apache.lucene.search.IndexSearcher
 import org.apache.lucene.search.LeafCollector
@@ -274,7 +275,14 @@ class LuceneSearchEngine(
                 override fun scoreMode(): ScoreMode = ScoreMode.COMPLETE_NO_SCORES
             }
 
-            searcher.search(context.query, collector)
+            // ponytail: searcher has no executor, so slices run sequentially and can share one collector
+            searcher.search(
+                context.query,
+                object : CollectorManager<Collector, Unit> {
+                    override fun newCollector(): Collector = collector
+                    override fun reduce(collectors: Collection<Collector>) = Unit
+                }
+            )
 
             SearchFacets(
                 totalHits = totalHits,