diff --git a/routes.go b/routes.go
index 7f690f1..b3cec93 100644
--- a/routes.go
+++ b/routes.go
@@ -140,7 +140,7 @@ var funcMap = template.FuncMap{
 		body = buf.String()
 		body = strings.Replace(body, `<img `, `<img loading="lazy" `, -1)
 		body = LemmyLinkRewrite(body, host, os.Getenv("LEMMY_DOMAIN"))
-		body = RegReplace(body, `::: spoiler (.*?)\n([\S\s]*?):::`, "<details><summary>$1</summary>$2</details>")
+		body = RegReplace(body, `::: ?spoiler (.*?)\n([\S\s]*?):::`, "<details><summary>$1</summary>$2</details>")
 		return template.HTML(body)
 	},
 	"rmmarkdown": func(body string) string {
diff --git a/state.go b/state.go
index cdaa921..9b5afab 100644
--- a/state.go
+++ b/state.go
@@ -544,7 +544,7 @@ func (state *State) Search(searchtype string) {
 	search := types.Search{
 		Q:           state.Query,
 		Sort:        types.NewOptional(types.SortType(state.Sort)),
-		ListingType: types.NewOptional(types.ListingType("All")),
+		ListingType: types.NewOptional(types.ListingType(state.Listing)),
 		Type:        types.NewOptional(types.SearchType(searchtype)),
 		Limit:       types.NewOptional(int64(25)),
 		Page:        types.NewOptional(int64(state.Page)),
diff --git a/templates/frontpage.html b/templates/frontpage.html
index 63637d1..ac291fd 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -29,9 +29,7 @@
   {{ template "nsfw.html" }}
 {{ else }}
     <main>
-  {{ if or (contains .Sort "Top") (and (not .PostID) (not .User) (not .Community) (not .Activities) (eq .Op ""))}}
-      {{ template "menu.html" . }}
-  {{ end}}
+    {{ template "menu.html" . }}
 
   {{ if .Error }}
       <div class="error">
diff --git a/templates/main.html b/templates/main.html
index e2d6390..5cf680d 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -27,12 +27,13 @@
   {{ template "nsfw.html" }}
 {{ else }}
     <main>
-  {{ if or (contains .Sort "Top") (and (not .PostID) (not .User) (not .Community) (not .Activities) (eq .Op ""))}}
+  {{ if or (.Query) (.SearchType) (and (not .PostID) (not .User) (not .Activities) (eq .Op ""))}}
     {{ template "menu.html" . }}
   {{ end}}
 
   {{ if or (ne .Query "") .Communities }}
       <form class="search" method="GET">
+        <input type="hidden" name="sort" value="{{.Sort}}">
         <div>search</div>
         <div class="query">
           <input type="text" name="q" value="{{.Query}}">
diff --git a/templates/nav.html b/templates/nav.html
index 769bb1e..e659f79 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -9,7 +9,7 @@
         <a href="/{{$host}}/c/{{fullcname $c.Community}}">{{$c.Community.Name}}</a>
         <span> - </span>
         {{ end }}
-        <a href="/{{$host}}/search?searchtype=Communities" class="more">more »</a>
+        <a href="/{{$host}}/search?searchtype=Communities&sort=TopAll" class="more">more »</a>
       </div>
       <div class="right">
 {{ if .Session }}
@@ -48,7 +48,7 @@
       <span>: search</span>
       {{ end }}
       <ul>
-        {{ if .User }}
+        {{ if and .User (not .Query)}}
         <li {{if eq .Op "" }}class="selected"{{end}}><a href="?">overview</a></li>
           {{ if and .Session (eq .User.PersonView.Person.ID .Session.UserID) }}
           <li {{if eq .Op "Saved"}}class="selected"{{end}}><a href="?view=Saved">saved</a></li>
diff --git a/templates/sidebar.html b/templates/sidebar.html
index ba3a5ce..87ce872 100644
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -9,6 +9,7 @@
   {{ else if .Community }}
         <input type="hidden" name="communityname" value="{{fullcname .Community.CommunityView.Community}}">
   {{ end }}
+        <input type="hidden" name="sort" value="New">
       </form>
 {{ end }}