diff --git a/content/_index.md b/content/_index.md
index 5bb6dc6..dd911c9 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -8,7 +8,9 @@ description: "Seirdy's Home: personal website and blog for Rohan Kumar, A.K.A. S
 sitemap:
     - ChangeFreq: weekly
     - Priority: 0.9
+stype: "WebSite"
 ---
+<meta itemprop="url" content="https://seirdy.one" />
 <div itemprop="author" itemscope="" itemtype="https://schema.org/Person" itemid="https://seirdy.one/#seirdy" class="p-author author h-card vcard" id="seirdy">
 
 Seirdy’s Home
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 1d2a040..2ab9f9e 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,9 +1,13 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{- default "" .Site.LanguageCode }}" xml:lang="{{- default "" .Site.LanguageCode }}" prefix="og: https://ogp.me/ns# article: https://ogp.me/ns/article# cc: http://creativecommons.org/ns#">
 {{ partial "head.html" . -}}
-<body itemscope="" itemtype="https://schema.org/WebPage">
+{{- $stype := "WebPage" -}}
+{{- with .Params.stype -}}
+	{{- $stype = . -}}
+{{- end -}}
+<body itemscope="" itemtype="https://schema.org/{{ $stype }}">
 {{ partial "header.html" . -}}
 {{- block "main" . }}{{- end -}}
-{{ partialCached "footer.html" . }}
+{{ partial "footer.html" . }}
 </body>
 </html>
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index f2bb863..00cc727 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -1,10 +1,12 @@
 {{ define "main" -}}
 {{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
-<main itemprop="mainEntity" itemscope="" itemtype="https://schema.org/SearchResultsPage" itemid="{{ .Site.Params.CanonicalBaseURL }}{{ $canonicalRelPermalink }}">
+<main >
 	<h1>Search</h1>
 	<p role="note">This page is an unfinished work-in-progress.</p>
 	{{ partial "search.html" . }}
 	<hr />
+	<div itemprop="mainEntity" itemscope="" itemtype="https://schema.org/SearchResultsPage" itemid="{{ .Site.Params.CanonicalBaseURL }}{{ $canonicalRelPermalink }}">
 	{{ readFile "/dynamic/search-results.html" | safeHTML }}
+	</div>
 </main>
 {{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 3007c08..ff7ca25 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,7 +3,9 @@
 	<p>
 	Copyright <time itemprop="copyrightYear" datetime="{{now.Year}}">{{now.Year}}</time> {{ partial "indieweb-author.html" -}}
 	</p>
-	{{ partial "search.html" }}
+	{{ if ne .Title "Search" -}}
+	{{- partial "search.html" -}}
+	{{- end -}}
 	<nav aria-label="site info">
 		<ul>
 			<li itemprop="license" itemscope="" itemtype="https://schema.org/CreativeWork">
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index b1594c5..0ce3dcf 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -1,11 +1,12 @@
 <form
 	itemprop="potentialAction" itemscope="" itemtype="https://schema.org/SearchAction"
 	action="https://seirdy.one/search/" method="get" role="search">
-	<label for="search">
+	<label for="search" itemscope="" itemprop="target" itemtype="https://schema.org/EntryPoint">
 		Search this site (powered by the <a rel="nofollow" href="https://searchmysite.net/">Search My Site</a> API):
+		<meta itemprop="urlTemplate" content="http://seirdy.one/search?q={q}" />
 	</label>
 	<div><!--We need the extra divs to serve as pseudo-table-cells.-->
-		<input id="search" type="search" itemprop="query" name="q" spellcheck="true" />
+		<input itemprop="query-input" id="search" type="search" required="" name="q" />
 		<div><input type="submit" value="search" /></div>
 	</div>
 </form>
diff --git a/linter-configs/vnu_filter.jq b/linter-configs/vnu_filter.jq
index fdaa783..830349c 100644
--- a/linter-configs/vnu_filter.jq
+++ b/linter-configs/vnu_filter.jq
@@ -13,6 +13,20 @@
 				.message == "Attribute “media” not allowed on element “meta” at this point."
 				and (.extract | test(" name=\"theme-color\""))
 			)
+			or
+			( # Allow raw templates
+				(.url | test ("/search/index."))
+				and (
+					(.message == "Text not allowed in element “ol” in this context.")
+					or
+					(.message == "Bad value “{{ .URL }}” for attribute “href” on element “a”: Illegal character in path segment: “{” is not allowed.")
+				)
+				and (
+					(.extract | test("{{"))
+					or
+					(.extract | test("}}"))
+				)
+			)
 		) | not
 	)
 ) | del(..|select(. == [])) | del(..|select(. == {})) | select(. != null)
