diff --git a/CHANGELOG b/CHANGELOG
index 18cf196c3..930f8b891 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 CHANGELOG
 
+2021-09-27: Target to API 30 and fix TTS query permission. Fix the "xifan hol" q to Q search bug.
 2021-08-09: New vocabulary from qep'a' 2021. Allow user-triggered database update over metered Internet.
 2021-04-13: Fix issue where attributes were not displayed in entry title if {pIqaD} is enabled.
 2021-04-09: Treat epithets as beings capable of language for the purposes of analysis.
diff --git a/app/build.gradle b/app/build.gradle
index 007b1e8d2..39a7f0a6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         // We are targeting only Marshmallow and above.
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 559
-        versionName "2021.09.22b"
+        versionCode 561
+        versionName "2021.09.27a"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e4d4ea15c..10cb00e7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,6 +25,14 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <!-- Needed in API 30 to query the TTS. -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+    </queries>
+
     <supports-screens android:resizeable="true"
                   android:smallScreens="true"
                   android:normalScreens="true"
diff --git a/app/src/main/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabase.java b/app/src/main/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabase.java
index ed018b1ca..0da95fd6b 100644
--- a/app/src/main/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabase.java
+++ b/app/src/main/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabase.java
@@ -193,7 +193,7 @@ public class KlingonContentDatabase {
 
   // This should be kept in sync with the version number in the data/VERSION
   // file used to generate the database which is bundled into the app.
-  private static final int BUNDLED_DATABASE_VERSION = 202108090;
+  private static final int BUNDLED_DATABASE_VERSION = 202109270;
 
   // Metadata about the installed database, and the updated database, if any.
   public static final String KEY_INSTALLED_DATABASE_VERSION = "installed_database_version";
diff --git a/app/src/test/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabaseTest.java b/app/src/test/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabaseTest.java
new file mode 100644
index 000000000..89685ef7e
--- /dev/null
+++ b/app/src/test/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabaseTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 De'vID jonpIn (David Yonge-Mallo)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.tlhInganHol.android.klingonassistant;
+
+import org.junit.Test;
+
+import android.content.Context;
+import android.database.Cursor;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Unit tests for KlingonContentDatabase logic.
+ */
+public class KlingonContentDatabaseTest {
+
+    @Test
+    public void klingonContentDatabase_overrideXifanHol() throws Exception {
+        KlingonContentDatabase database = new KlingonContentDatabase(null);
+        Cursor result = database.getEntryMatches("+xifan hol");
+        assertEquals(result.getCount(), 0);
+    }
+
+}
diff --git a/data b/data
index bd73b9fe0..2caa84d58 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit bd73b9fe02e8a80b8364524611d54b2043f969a4
+Subproject commit 2caa84d58c4ee344c4fc1fb25fae8f8b0d991833