diff --git a/.fdroid.yml b/.fdroid.yml
new file mode 120000
index 0000000..bf7d02f
--- /dev/null
+++ b/.fdroid.yml
@@ -0,0 +1 @@
+../fdroid/fdroiddata/metadata/com.github.apognu.otter.yml
\ No newline at end of file
diff --git a/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt b/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
index 7275d69..bbdac8e 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
+++ b/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
@@ -10,6 +10,7 @@ import com.github.apognu.otter.repositories.Repository
 import com.github.apognu.otter.repositories.SearchRepository
 import com.github.apognu.otter.utils.untilNetwork
 import kotlinx.android.synthetic.main.activity_search.*
+import java.net.URLEncoder
 import java.util.*
 
 class SearchActivity : AppCompatActivity() {
@@ -36,7 +37,9 @@ class SearchActivity : AppCompatActivity() {
     search.setOnQueryTextListener(object : androidx.appcompat.widget.SearchView.OnQueryTextListener {
       override fun onQueryTextSubmit(query: String?): Boolean {
         query?.let {
-          repository = SearchRepository(this@SearchActivity, it.toLowerCase(Locale.ROOT))
+          val query = URLEncoder.encode(it, "UTF-8")
+
+          repository = SearchRepository(this@SearchActivity, query.toLowerCase(Locale.ROOT))
 
           search_spinner.visibility = View.VISIBLE
           search_no_results.visibility = View.GONE
diff --git a/app/src/main/res/layout/partial_now_playing.xml b/app/src/main/res/layout/partial_now_playing.xml
index e48cb61..8798430 100644
--- a/app/src/main/res/layout/partial_now_playing.xml
+++ b/app/src/main/res/layout/partial_now_playing.xml
@@ -53,6 +53,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        android:layout_marginEnd="8dp"
         android:layout_weight="2"
         android:orientation="vertical">
 
@@ -60,6 +61,8 @@
           android:id="@+id/now_playing_title"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
+          android:ellipsize="end"
+          android:lines="1"
           android:textColor="@color/itemTitle"
           tools:text="Supermassive Black Hole" />
 
@@ -67,6 +70,8 @@
           android:id="@+id/now_playing_album"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
+          android:ellipsize="end"
+          android:lines="1"
           tools:text="Muse" />
 
       </LinearLayout>