diff --git a/templates/search.tmpl b/templates/search.tmpl
index 11c584a..f81c061 100644
--- a/templates/search.tmpl
+++ b/templates/search.tmpl
@@ -3,11 +3,11 @@
 <div class="page-title"> Search </div>
 
 <form class="search-form" action="/search" method="GET">
-	<span class="post-form-field>
+	<span class="post-form-field">
 		<label for="query"> Query </label>
 		<input id="query" name="q" value="{{.Q | HTMLEscape}}">
 	</span>
-	<span class="post-form-field>
+	<span class="post-form-field">
 		<label for="type"> Type </label>
 		<select id="type" name="type">
 			<option value="statuses" {{if eq .Type "statuses"}}selected{{end}}>Statuses</option>
@@ -23,8 +23,8 @@
 {{else}}
 <div class="no-data-found">No data found</div>
 {{end}}
-
 {{end}}
+
 {{if eq .Type "accounts"}}
 {{template "userlist.tmpl" (WithContext .Users $.Ctx)}}
 {{end}}
diff --git a/templates/userlist.tmpl b/templates/userlist.tmpl
index 83fa1df..426bffc 100644
--- a/templates/userlist.tmpl
+++ b/templates/userlist.tmpl
@@ -14,6 +14,10 @@
 			</a>
 		</div>
 	</div>
+	{{else}}
+	<div class="no-data-found">No data found</div>
 	{{end}}
 </div>
+{{else}}
+<div class="no-data-found">No data found</div>
 {{end}}
diff --git a/templates/usersearch.tmpl b/templates/usersearch.tmpl
index e5f2bfc..26186c0 100644
--- a/templates/usersearch.tmpl
+++ b/templates/usersearch.tmpl
@@ -12,6 +12,8 @@
 
 {{range .Statuses}}
 {{template "status.tmpl" (WithContext . $.Ctx)}}
+{{else}}
+<div class="no-data-found">No data found</div>
 {{end}}
 
 <div class="pagination">