diff --git a/src/routes/search.rs b/src/routes/search.rs
index 0341bf8f..7eabc6f7 100644
--- a/src/routes/search.rs
+++ b/src/routes/search.rs
@@ -55,7 +55,7 @@ pub fn search(query: Option<Form<SearchQuery>>, rockets: PlumeRocket) -> Ructe {
     let query = query.map(Form::into_inner).unwrap_or_default();
     let page = query.page.unwrap_or_default();
     let mut parsed_query =
-        Query::from_str(&query.q.as_ref().map(String::as_str).unwrap_or_default())
+        Query::from_str(&query.q.as_deref().unwrap_or_default())
             .unwrap_or_default();
 
     param_to_query!(query, parsed_query; normal: title, subtitle, content, tag,
diff --git a/templates/partials/comment.rs.html b/templates/partials/comment.rs.html
index d6f07e91..a1bafec3 100644
--- a/templates/partials/comment.rs.html
+++ b/templates/partials/comment.rs.html
@@ -42,7 +42,7 @@
         }
     </main>
     @for res in &comment_tree.responses {
-        @:comment_html(ctx, res, comm.ap_url.as_ref().map(|u| &**u), blog, slug)
+        @:comment_html(ctx, res, comm.ap_url.as_deref(), blog, slug)
     }
 </div>
 }}