diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..40d5f5bb
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+.git
+docker-compose.yml
+Dockerfile
+.gitignore
+.DS_Store
+node_modules
diff --git a/Dockerfile b/Dockerfile
index a3e31e09..871b8a87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,10 @@
 FROM node:12.18-alpine
 
+ARG DATABASE_TYPE
+
+ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami" \
+    DATABASE_TYPE=$DATABASE_TYPE
+
 COPY . /app
 WORKDIR /app
 
diff --git a/components/metrics/ActiveUsers.js b/components/metrics/ActiveUsers.js
index 4d1118fa..10c10155 100644
--- a/components/metrics/ActiveUsers.js
+++ b/components/metrics/ActiveUsers.js
@@ -38,7 +38,7 @@ export default function ActiveUsers({ websiteId, className }) {
         <animated.div className={styles.value}>
           {props.x.interpolate(x => x.toFixed(0))}
         </animated.div>
-        <div>{`current vistor${count !== 1 ? 's' : ''}`}</div>
+        <div>{`current visitor${count !== 1 ? 's' : ''}`}</div>
       </div>
     </div>
   );
diff --git a/docker-compose.yml b/docker-compose.yml
index b09b81eb..7f1b42ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,25 +1,24 @@
-version: '3.8'
+---
+version: '3'
 services:
   umami:
     build: .
     ports:
       - "3000:3000"
     environment:
-      DATABASE_URL: postgresql://umami:umami@postgres:5432/umami
+      DATABASE_URL: postgresql://umami:umami@db:5432/umami
+      DATABASE_TYPE: postgresql
       HASH_SALT: replace-me-with-a-random-string
-  postgres:
+    depends_on:
+      - db
+  db:
     image: postgres:alpine
-    ports:
-      - "5432:5432"
     environment:
+      POSTGRES_DB: umami
       POSTGRES_USER: umami
       POSTGRES_PASSWORD: umami
     volumes:
-      - type: bind
-        source: ./sql/schema.postgresql.sql
-        target: /docker-entrypoint-initdb.d/schema.postgresql.sql
-      - type: volume
-        source: postgres-data
-        target: /var/lib/postgresql/data
+      - ./sql/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro
+      - umami-db-data:/var/lib/postgresql/data
 volumes:
-  postgres-data:
+  umami-db-data:
diff --git a/lib/web.js b/lib/web.js
index b75a6ba7..3cf942ab 100644
--- a/lib/web.js
+++ b/lib/web.js
@@ -46,3 +46,28 @@ export const hook = (_this, method, callback) => {
     return orig.apply(_this, args);
   };
 };
+
+export const doNotTrack = () => {
+  if (
+    window.doNotTrack ||
+    navigator.doNotTrack ||
+    navigator.msDoNotTrack ||
+    'msTrackingProtectionEnabled' in window.external
+  ) {
+    if (
+      window.doNotTrack == '1' ||
+      navigator.doNotTrack == 'yes' ||
+      navigator.doNotTrack == '1' ||
+      navigator.msDoNotTrack == '1' ||
+      (window.external &&
+        window.external.msTrackingProtectionEnabled &&
+        window.external.msTrackingProtectionEnabled())
+    ) {
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return false;
+  }
+};
diff --git a/pages/share/[...id].js b/pages/share/[...id].js
index 15b911d4..21005a53 100644
--- a/pages/share/[...id].js
+++ b/pages/share/[...id].js
@@ -6,6 +6,7 @@ import NotFound from 'pages/404';
 import { get } from 'lib/web';
 
 export default function SharePage() {
+  const [loading, setLoading] = useState(true);
   const [websiteId, setWebsiteId] = useState();
   const [notFound, setNotFound] = useState(false);
   const router = useRouter();
@@ -23,10 +24,16 @@ export default function SharePage() {
 
   useEffect(() => {
     if (id) {
-      loadData();
+      loadData().finally(() => {
+        setLoading(false);
+      });
+    } else {
+      setLoading(false);
     }
   }, [id]);
 
+  if (loading) return null;
+
   if (!id || notFound) {
     return <NotFound />;
   }
diff --git a/public/umami.js b/public/umami.js
index 64a68198..c46c7566 100644
--- a/public/umami.js
+++ b/public/umami.js
@@ -1 +1 @@
-!function(){"use strict";function e(e){var t=this.constructor;return this.then((function(n){return t.resolve(e()).then((function(){return n}))}),(function(n){return t.resolve(e()).then((function(){return t.reject(n)}))}))}var t=setTimeout;function n(e){return Boolean(e&&void 0!==e.length)}function r(){}function o(e){if(!(this instanceof o))throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],f(e,this)}function i(e,t){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,o._immediateFn((function(){var n=1===e._state?t.onFulfilled:t.onRejected;if(null!==n){var r;try{r=n(e._value)}catch(e){return void a(t.promise,e)}u(t.promise,r)}else(1===e._state?u:a)(t.promise,e._value)}))):e._deferreds.push(t)}function u(e,t){try{if(t===e)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if(t instanceof o)return e._state=3,e._value=t,void c(e);if("function"==typeof n)return void f((r=n,i=t,function(){r.apply(i,arguments)}),e)}e._state=1,e._value=t,c(e)}catch(t){a(e,t)}var r,i}function a(e,t){e._state=2,e._value=t,c(e)}function c(e){2===e._state&&0===e._deferreds.length&&o._immediateFn((function(){e._handled||o._unhandledRejectionFn(e._value)}));for(var t=0,n=e._deferreds.length;t<n;t++)i(e,e._deferreds[t]);e._deferreds=null}function s(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function f(e,t){var n=!1;try{e((function(e){n||(n=!0,u(t,e))}),(function(e){n||(n=!0,a(t,e))}))}catch(e){if(n)return;n=!0,a(t,e)}}o.prototype["catch"]=function(e){return this.then(null,e)},o.prototype.then=function(e,t){var n=new this.constructor(r);return i(this,new s(e,t,n)),n},o.prototype["finally"]=e,o.all=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.all accepts an array"));var o=Array.prototype.slice.call(e);if(0===o.length)return t([]);var i=o.length;function u(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var a=n.then;if("function"==typeof a)return void a.call(n,(function(t){u(e,t)}),r)}o[e]=n,0==--i&&t(o)}catch(e){r(e)}}for(var a=0;a<o.length;a++)u(a,o[a])}))},o.resolve=function(e){return e&&"object"==typeof e&&e.constructor===o?e:new o((function(t){t(e)}))},o.reject=function(e){return new o((function(t,n){n(e)}))},o.race=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.race accepts an array"));for(var i=0,u=e.length;i<u;i++)o.resolve(e[i]).then(t,r)}))},o._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){t(e,0)},o._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)};var l=function(){if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if("undefined"!=typeof global)return global;throw new Error("unable to locate global object")}();"Promise"in l?l.Promise.prototype["finally"]||(l.Promise.prototype["finally"]=e):l["Promise"]=o,self.fetch||(self.fetch=function(e,t){return t=t||{},new Promise((function(n,r){var o=new XMLHttpRequest,i=[],u=[],a={},c=function(){return{ok:2==(o.status/100|0),statusText:o.statusText,status:o.status,url:o.responseURL,text:function(){return Promise.resolve(o.responseText)},json:function(){return Promise.resolve(JSON.parse(o.responseText))},blob:function(){return Promise.resolve(new Blob([o.response]))},clone:c,headers:{keys:function(){return i},entries:function(){return u},get:function(e){return a[e.toLowerCase()]},has:function(e){return e.toLowerCase()in a}}}};for(var s in o.open(t.method||"get",e,!0),o.onload=function(){o.getAllResponseHeaders().replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm,(function(e,t,n){i.push(t=t.toLowerCase()),u.push([t,n]),a[t]=a[t]?a[t]+","+n:n})),n(c())},o.onerror=r,o.withCredentials="include"==t.credentials,t.headers)o.setRequestHeader(s,t.headers[s]);o.send(t.body||null)}))});var h=function(e,t){return function(e,t,n){return fetch(t,{method:e,cache:"no-cache",headers:{Accept:"application/json","Content-Type":"application/json"},body:n}).then((function(t){return t.ok?t.json():["post","put","delete"].includes(e)?t.text():null}))}("post",e,JSON.stringify(t))},p=function(e,t,n){var r=e[t];return function(){for(var t=[],o=arguments.length;o--;)t[o]=arguments[o];return n.apply(null,t),r.apply(e,t)}};!function(e){var t=e.screen,n=t.width,r=t.height,o=e.navigator.language,i=e.location,u=i.hostname,a=i.pathname,c=i.search,s=e.document,f=e.history,l=s.querySelector("script[data-website-id]");if(l){var d=l.getAttribute("data-website-id"),v=new URL(l.src).origin,y=n+"x"+r,m=[],w=""+a+c,_=s.referrer,g=function(e,t){var n={url:w,referrer:_,website:d,hostname:u,screen:y,language:o};return t&&Object.keys(t).forEach((function(e){n[e]=t[e]})),h(v+"/api/collect",{type:e,payload:n})},b=function(){return g("pageview").then((function(){return setTimeout(E,300)}))},j=function(e,t,n){P(),_=w,w=n,b()};f.pushState=p(f,"pushState",j),f.replaceState=p(f,"replaceState",j);var P=function(){m.forEach((function(e){var t=e[0],n=e[1],r=e[2];t&&t.removeEventListener(n,r,!0)})),m.length=0},E=function(){s.querySelectorAll("[class*='umami--']").forEach((function(e){e.className.split(" ").forEach((function(t){if(/^umami--([a-z]+)--([a-z0-9_]+[a-z0-9-_]+)$/.test(t)){var n=t.split("--"),r=n[1],o=n[2],i=function(){return g("event",{event_type:r,event_value:o})};m.push([e,r,i]),e.addEventListener(r,i,!0)}}))}))};b()}}(window)}();
+!function(){"use strict";function e(e){var t=this.constructor;return this.then((function(n){return t.resolve(e()).then((function(){return n}))}),(function(n){return t.resolve(e()).then((function(){return t.reject(n)}))}))}var t=setTimeout;function n(e){return Boolean(e&&void 0!==e.length)}function r(){}function o(e){if(!(this instanceof o))throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],f(e,this)}function i(e,t){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,o._immediateFn((function(){var n=1===e._state?t.onFulfilled:t.onRejected;if(null!==n){var r;try{r=n(e._value)}catch(e){return void u(t.promise,e)}a(t.promise,r)}else(1===e._state?a:u)(t.promise,e._value)}))):e._deferreds.push(t)}function a(e,t){try{if(t===e)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if(t instanceof o)return e._state=3,e._value=t,void c(e);if("function"==typeof n)return void f((r=n,i=t,function(){r.apply(i,arguments)}),e)}e._state=1,e._value=t,c(e)}catch(t){u(e,t)}var r,i}function u(e,t){e._state=2,e._value=t,c(e)}function c(e){2===e._state&&0===e._deferreds.length&&o._immediateFn((function(){e._handled||o._unhandledRejectionFn(e._value)}));for(var t=0,n=e._deferreds.length;t<n;t++)i(e,e._deferreds[t]);e._deferreds=null}function s(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function f(e,t){var n=!1;try{e((function(e){n||(n=!0,a(t,e))}),(function(e){n||(n=!0,u(t,e))}))}catch(e){if(n)return;n=!0,u(t,e)}}o.prototype["catch"]=function(e){return this.then(null,e)},o.prototype.then=function(e,t){var n=new this.constructor(r);return i(this,new s(e,t,n)),n},o.prototype["finally"]=e,o.all=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.all accepts an array"));var o=Array.prototype.slice.call(e);if(0===o.length)return t([]);var i=o.length;function a(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var u=n.then;if("function"==typeof u)return void u.call(n,(function(t){a(e,t)}),r)}o[e]=n,0==--i&&t(o)}catch(e){r(e)}}for(var u=0;u<o.length;u++)a(u,o[u])}))},o.resolve=function(e){return e&&"object"==typeof e&&e.constructor===o?e:new o((function(t){t(e)}))},o.reject=function(e){return new o((function(t,n){n(e)}))},o.race=function(e){return new o((function(t,r){if(!n(e))return r(new TypeError("Promise.race accepts an array"));for(var i=0,a=e.length;i<a;i++)o.resolve(e[i]).then(t,r)}))},o._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){t(e,0)},o._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)};var l=function(){if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if("undefined"!=typeof global)return global;throw new Error("unable to locate global object")}();"Promise"in l?l.Promise.prototype["finally"]||(l.Promise.prototype["finally"]=e):l["Promise"]=o,self.fetch||(self.fetch=function(e,t){return t=t||{},new Promise((function(n,r){var o=new XMLHttpRequest,i=[],a=[],u={},c=function(){return{ok:2==(o.status/100|0),statusText:o.statusText,status:o.status,url:o.responseURL,text:function(){return Promise.resolve(o.responseText)},json:function(){return Promise.resolve(JSON.parse(o.responseText))},blob:function(){return Promise.resolve(new Blob([o.response]))},clone:c,headers:{keys:function(){return i},entries:function(){return a},get:function(e){return u[e.toLowerCase()]},has:function(e){return e.toLowerCase()in u}}}};for(var s in o.open(t.method||"get",e,!0),o.onload=function(){o.getAllResponseHeaders().replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm,(function(e,t,n){i.push(t=t.toLowerCase()),a.push([t,n]),u[t]=u[t]?u[t]+","+n:n})),n(c())},o.onerror=r,o.withCredentials="include"==t.credentials,t.headers)o.setRequestHeader(s,t.headers[s]);o.send(t.body||null)}))});var d=function(e,t){return function(e,t,n){return fetch(t,{method:e,cache:"no-cache",headers:{Accept:"application/json","Content-Type":"application/json"},body:n}).then((function(t){return t.ok?t.json():["post","put","delete"].includes(e)?t.text():null}))}("post",e,JSON.stringify(t))},h=function(e,t,n){var r=e[t];return function(){for(var t=[],o=arguments.length;o--;)t[o]=arguments[o];return n.apply(null,t),r.apply(e,t)}},p=function(){return!!(window.doNotTrack||navigator.doNotTrack||navigator.msDoNotTrack||"msTrackingProtectionEnabled"in window.external)&&!!("1"==window.doNotTrack||"yes"==navigator.doNotTrack||"1"==navigator.doNotTrack||"1"==navigator.msDoNotTrack||window.external&&window.external.msTrackingProtectionEnabled&&window.external.msTrackingProtectionEnabled())};!function(e){var t=e.screen,n=t.width,r=t.height,o=e.navigator.language,i=e.location,a=i.hostname,u=i.pathname,c=i.search,s=e.document,f=e.history,l=s.querySelector("script[data-website-id]");if(l&&!p()){var v=l.getAttribute("data-website-id"),y=new URL(l.src).origin,w=n+"x"+r,m=[],_=""+u+c,g=s.referrer,b=function(e,t){var n={url:_,referrer:g,website:v,hostname:a,screen:w,language:o};return t&&Object.keys(t).forEach((function(e){n[e]=t[e]})),d(y+"/api/collect",{type:e,payload:n})},T=function(){return b("pageview").then((function(){return setTimeout(E,300)}))},j=function(e,t,n){P(),g=_;var r=new URL(n);_=""+r.pathname+r.search,T()};f.pushState=h(f,"pushState",j),f.replaceState=h(f,"replaceState",j);var P=function(){m.forEach((function(e){var t=e[0],n=e[1],r=e[2];t&&t.removeEventListener(n,r,!0)})),m.length=0},E=function(){s.querySelectorAll("[class*='umami--']").forEach((function(e){e.className.split(" ").forEach((function(t){if(/^umami--([a-z]+)--([a-z0-9_]+[a-z0-9-_]+)$/.test(t)){var n=t.split("--"),r=n[1],o=n[2],i=function(){return b("event",{event_type:r,event_value:o})};m.push([e,r,i]),e.addEventListener(r,i,!0)}}))}))};T()}}(window)}();
diff --git a/scripts/copy-db-schema.js b/scripts/copy-db-schema.js
index 60c39598..5dda2215 100644
--- a/scripts/copy-db-schema.js
+++ b/scripts/copy-db-schema.js
@@ -2,15 +2,15 @@ require('dotenv').config();
 const fs = require('fs');
 const path = require('path');
 
-const db = process.env.DATABASE_URL.split(':')[0];
+const databaseType = process.env.DATABASE_TYPE || process.env.DATABASE_URL.split(':')[0];
 
-if (!db) {
-  throw new Error('Database not specified');
+if (!databaseType) {
+  throw new Error('Database schema not specified');
 }
 
-console.log(`Database detected: ${db}`);
+console.log(`Database schema detected: ${databaseType}`);
 
-const src = path.resolve(__dirname, `../prisma/schema.${db}.prisma`);
+const src = path.resolve(__dirname, `../prisma/schema.${databaseType}.prisma`);
 const dest = path.resolve(__dirname, '../prisma/schema.prisma');
 
 fs.copyFileSync(src, dest);
diff --git a/tracker/index.js b/tracker/index.js
index 4449b9c9..15f95d8a 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -1,6 +1,6 @@
 import 'promise-polyfill/src/polyfill';
 import 'unfetch/polyfill';
-import { post, hook } from '../lib/web';
+import { post, hook, doNotTrack } from '../lib/web';
 
 (window => {
   const {
@@ -13,7 +13,7 @@ import { post, hook } from '../lib/web';
 
   const script = document.querySelector('script[data-website-id]');
 
-  if (!script) return;
+  if (!script || doNotTrack()) return;
 
   const website = script.getAttribute('data-website-id');
   const hostUrl = new URL(script.src).origin;
@@ -53,10 +53,11 @@ import { post, hook } from '../lib/web';
 
   /* Handle history */
 
-  const handlePush = (state, title, url) => {
+  const handlePush = (state, title, navaigatedUrl) => {
     removeEvents();
     currentRef = currentUrl;
-    currentUrl = url;
+    const url = new URL(navaigatedUrl);
+    currentUrl = `${url.pathname}${url.search}`;
     pageView();
   };