diff --git a/data.json b/data.json
deleted file mode 100644
index 94ee9c9..0000000
--- a/data.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "instances": [
-    "https://searxng.no-logs.com/search"
-  ]
-}
diff --git a/index.html b/index.html
index dfad61c..1f7e9b3 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta name="referrer" content="no-referrer">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="search" type="application/opensearchdescription+xml" href="opensearch.xml">
     <style>
       * { margin: 0; }
       html, body { width: 100%; height: 100%; }
diff --git a/index.js b/index.js
index 0ce4547..60f0b53 100644
--- a/index.js
+++ b/index.js
@@ -1,24 +1,38 @@
 const storageType = 'localStorage'
 
-var data = {}
+let data = {}
 
 const infoEl = document.getElementById('info')
 const formEl = document.getElementById('search')
 
+const errors = {
+  missingQuery: new TypeError('Query is missing.'),
+  noFoundInstances: new TypeError('No instances were found.'),
+}
+
+function buildSearchURL (opts = {}) {
+  if (typeof opts.query !== 'string') throw errors.missingQuery
+  if (!('instances' in data)) throw errors.noFoundInstances
+  if (data.instances.length === 0) throw errors.noFoundInstances
+
+  // Random instance
+  const n = Math.floor(Math.random() * data.instances.length)
+  const instanceURL = data.instances[n]
+
+  // Build URL
+  const params = new URLSearchParams({
+    q: opts.query
+  })
+  const url = `${instanceURL}?${params.toString()}`
+  return url
+}
+
 // Register event listeners
 formEl.addEventListener('submit', (event) => {
   event.preventDefault()
-  if ('instances' in data && data.instances.length > 0) {
-    // Random instance
-    const n = Math.floor(Math.random() * data.instances.length)
-    const instanceURL = data.instances[n]
-    // Assign URL
-    const params = new URLSearchParams({
-      q: formEl.query.value
-    })
-    const url = `${instanceURL}?${params.toString()}`
-    location.assign(url)
-  }
+  location.assign(buildSearchURL({
+    query: formEl.query.value
+  }))
 })
 
 function locallyGetInstances () {
@@ -73,9 +87,19 @@ if (Date.now() > timestamp + 3_600_000 /* 1 hour */) {
   }
 }
 
+// Auto-redirect in presence of search parameters
+if (location.search.length > 0) {
+  const searchParams = new URLSearchParams(location.search.slice(1))
+  if (searchParams.has('q')) {
+    location.assign(buildSearchURL({
+      query: searchParams.get('q')
+    }))
+  }
+}
+
 if (data.instances.length > 0) {
   infoEl.textContent = `${data.instances.length} instances`
 } else {
   infoEl.classList.add('error')
   infoEl.textContent = '0 instances'
-}
+}
\ No newline at end of file
diff --git a/opensearchdescription.xml b/opensearchdescription.xml
new file mode 100644
index 0000000..029ed1d
--- /dev/null
+++ b/opensearchdescription.xml
@@ -0,0 +1,7 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>TROM</ShortName>
+  <Description>TROM Metasearch</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <Url type="application/opensearchdescription+xml" rel="self" template="https://testsearch.trom.tf/opensearchdescription.xml">
+  <Url type="text/html" template="https://testsearch.trom.tf/?q={searchTerms}">
+</OpenSearchDescription>
\ No newline at end of file