diff --git a/ultrasonic/src/main/res/layout/search.xml b/ultrasonic/src/main/res/layout/search.xml
index 42e0e492..87d5ab49 100644
--- a/ultrasonic/src/main/res/layout/search.xml
+++ b/ultrasonic/src/main/res/layout/search.xml
@@ -2,19 +2,8 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
     a:layout_width="match_parent"
     a:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     a:orientation="vertical">
 
-
-    <com.google.android.material.search.SearchView
-        a:layout_width="match_parent"
-        a:layout_height="match_parent"
-        a:hint="@string/search.title"
-        app:layout_anchor="@id/search_bar">
-        <!-- Search suggestions/results go here (ScrollView, RecyclerView, etc.). -->
-
-
-
     <include layout="@layout/list_parts_empty_view" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -30,6 +19,5 @@
             a:layout_weight="1.0" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    </com.google.android.material.search.SearchView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml
index 0cb675bb..36cf28c0 100644
--- a/ultrasonic/src/main/res/values/strings.xml
+++ b/ultrasonic/src/main/res/values/strings.xml
@@ -447,7 +447,7 @@
     <string name="settings.five_star_rating_title">Use five star rating for songs</string>
     <string name="settings.five_star_rating_description">Use five star rating system for songs instead of simply starring/unstarring items.</string>
     <string name="settings.use_hw_offload_title">Use hardware playback (experimental)</string>
-    <string name="settings.use_hw_offload_description">Try to play the media using the media decoder chip on your phone. This can improve battery usage.</string>
+    <string name="settings.use_hw_offload_description">Try to play the media using the media decoder chip on your phone. This can improve battery usage. Some users report glitches in playback when they activate this option!</string>
     <string name="list_view">List</string>
     <string name="grid_view">Cover</string>
     <string name="supported_server_features">Supported features</string>
diff --git a/ultrasonic/src/main/res/xml/searchable.xml b/ultrasonic/src/main/res/xml/searchable.xml
index bcb0d20f..add20279 100644
--- a/ultrasonic/src/main/res/xml/searchable.xml
+++ b/ultrasonic/src/main/res/xml/searchable.xml
@@ -5,6 +5,6 @@
             a:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
             a:queryAfterZeroResults="true"
             a:voiceLanguageModel="web_search"
-            a:searchSuggestAuthority="org.moire.ultrasonic.provider.SearchSuggestionProvider"
+            a:searchSuggestAuthority="${applicationId}.provider.SearchSuggestionProvider"
             a:searchSuggestSelection=" ?" >
 </searchable>
\ No newline at end of file