diff --git a/api/v1/ac.php b/api/v1/ac.php
index c909aab..457897a 100644
--- a/api/v1/ac.php
+++ b/api/v1/ac.php
@@ -7,7 +7,7 @@ class autocomplete{
 	
 	public function __construct(){
 		
-		header("Content-Type: application/json");
+		header("Content-Type: application/x-suggestions+json");
 		
 		$this->scrapers = [
 			"brave" => "https://search.brave.com/api/suggest?q={searchTerms}",
@@ -18,7 +18,6 @@ class autocomplete{
 			"marginalia" => "https://search.marginalia.nu/suggest/?partial={searchTerms}",
 			"yt" => "https://suggestqueries-clients6.youtube.com/complete/search?client=youtube&q={searchTerms}",
 			"sc" => "",
-			"startpage" => "https://www.startpage.com/suggestions?q={searchTerms}&format=opensearch&segment=startpage.defaultffx&lui=english",
 			"kagi" => "https://kagi.com/api/autosuggest?q={searchTerms}"
 		];
 		
diff --git a/opensearch.php b/opensearch.php
index 4bdf97c..dc36ea1 100644
--- a/opensearch.php
+++ b/opensearch.php
@@ -3,32 +3,46 @@
 header("Content-Type: application/xml");
 include "data/config.php";
 
-$domain =
-	htmlspecialchars(
-		(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? "https" : "http") .
-		'://' . $_SERVER["HTTP_HOST"]
-	);
+$host = strtolower(explode(":", $_SERVER["HTTP_HOST"], 2)[0]);
 
+// detect if 4get should serve the HTTPS endpoint
 if(
 	preg_match(
-		'/\.onion$/',
-		$domain
+		'/\.(onion|i2p)$/',
+		strtolower($host),
+		$match
 	)
 ){
 	
-	$onion = true;
+	$ssl = false;
+	$src = $match[1];
+}elseif(
+	is_string(
+		filter_var(
+			$host,
+			FILTER_VALIDATE_IP
+		)
+	) ||
+	$host == "localhost"
+){
+	
+	$ssl = false;
+	$src = "localhost";
 }else{
 	
-	$onion = false;
+	$ssl = true;
 }
 
+$domain = ($ssl ? "https" : "http") . "://" . $_SERVER["HTTP_HOST"];
+
 echo
 	'<?xml version="1.0" encoding="UTF-8"?>' .
-	'<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">' .
-		'<ShortName>' . htmlspecialchars(config::SERVER_NAME) . ($onion ? " (onion)" : "") . '</ShortName>' .
+	'<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">' .
+		'<ShortName>' . htmlspecialchars(config::SERVER_NAME) . ($ssl === false ? " ({$src})" : "") . '</ShortName>' .
+		'<Description>' . htmlspecialchars(config::SERVER_SHORT_DESCRIPTION) . '</Description>' .
 		'<InputEncoding>UTF-8</InputEncoding>' .
-		'<Image width="16" height="16">' . $domain . '/favicon.ico</Image>' .
-		'<Url type="text/html" method="GET" template="' . $domain . '/web?s={searchTerms}"/>';
+		'<Image width="16" height="16" type="image/x-icon">' . htmlspecialchars($domain) . '/favicon.ico</Image>' .
+		'<Url type="text/html" method="GET" template="' . htmlspecialchars($domain) . '/web?s={searchTerms}"/>';
 
 if(
 	isset($_GET["ac"]) &&
@@ -36,7 +50,7 @@ if(
 	$_GET["ac"] != "disabled"
 ){
 	
-	echo '<Url rel="suggestions" type="application/x-suggestions+json" template="' . $domain . '/api/v1/ac?s={searchTerms}&amp;scraper=' . htmlspecialchars($_GET["ac"]) . '"/>';
+	echo '<Url type="application/x-suggestions+json" template="' . $domain . '/api/v1/ac?s={searchTerms}&amp;scraper=' . htmlspecialchars($_GET["ac"]) . '"/>';
 }
 
 echo '</OpenSearchDescription>';