diff --git a/app/src/main/java/exh/search/Text.kt b/app/src/main/java/exh/search/Text.kt
index 63acb9e83..210bde398 100644
--- a/app/src/main/java/exh/search/Text.kt
+++ b/app/src/main/java/exh/search/Text.kt
@@ -12,7 +12,7 @@ class Text: QueryComponent() {
             when(component) {
                 is StringTextComponent -> builder.then(component.value)
                 is SingleWildcard -> builder.anyChar()
-                is MultiWildcard -> builder.zeroOrMore()
+                is MultiWildcard -> builder.anything()
             }
         }
         return builder
@@ -20,5 +20,7 @@ class Text: QueryComponent() {
 
     fun rawTextOnly() = components
             .filter { it is StringTextComponent }
-            .joinToString(separator = "")
+            .joinToString(separator = "", transform = {
+                (it as StringTextComponent).value
+            })
 }