diff --git a/public/umami.js b/public/umami.js
index 3d201df3..22773f3c 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 s(t.promise,e)}u(t.promise,r)}else(1===e._state?u:s)(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 a(e);if("function"==typeof n)return void f((r=n,i=t,function(){r.apply(i,arguments)}),e)}e._state=1,e._value=t,a(e)}catch(t){s(e,t)}var r,i}function s(e,t){e._state=2,e._value=t,a(e)}function a(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 c(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,s(t,e))}))}catch(e){if(n)return;n=!0,s(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 c(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 s=n.then;if("function"==typeof s)return void s.call(n,(function(t){u(e,t)}),r)}o[e]=n,0==--i&&t(o)}catch(e){r(e)}}for(var s=0;s<o.length;s++)u(s,o[s])}))},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=[],s={},a=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:a,headers:{keys:function(){return i},entries:function(){return u},get:function(e){return s[e.toLowerCase()]},has:function(e){return e.toLowerCase()in s}}}};for(var c 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]),s[t]=s[t]?s[t]+","+n:n})),n(a())},o.onerror=r,o.withCredentials="include"==t.credentials,t.headers)o.setRequestHeader(c,t.headers[c]);o.send(t.body||null)}))});var p=window.screen,d=p.width,h=p.height,v=window.navigator.language,y=window.location,w=y.hostname,m=y.pathname,_=y.search,g=window.localStorage,b=window.document,j=window.history,P=b.querySelector("script[data-website-id]");if(P){var S=P.getAttribute("data-website-id");if(S){var T="umami.session",R=new URL(P.src).origin,E=d+"x"+h,x=""+m+_,F=b.referrer,L=function(e,t){return fetch(e,{method:"post",cache:"no-cache",headers:{Accept:"application/json","Content-Type":"application/json"},body:JSON.stringify(t)}).then((function(e){return e.json()}))},O=function(e){return L(R+"/api/session",e).then((function(e){var t=e.success,n=function(e,t){var n={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&-1===t.indexOf(r)&&(n[r]=e[r]);return n}(e,["success"]);if(t)return g.setItem(T,JSON.stringify(n)),t}))},A=function(){return JSON.parse(g.getItem(T))},I=function(e,t){return L(R+"/api/collect",{type:"pageview",payload:{url:e,referrer:t,session:A()}}).then((function(e){var t=e.success;return t||g.removeItem(T),t}))},C=function(e,t){var n=function(e){return{website_id:S,hostname:w,url:e,screen:E,language:v}}(e);g.getItem(T)?I(e,t).then((function(r){return!r&&O(n).then((function(n){return n&&I(e,t)}))})):O(n).then((function(n){return n&&I(e,t)}))},N=function(e,t,n){F=x,C(x=n,F)},q=function(e,t){var n=j[e];return function(e,r,o){var i=[e,r,o];return t.apply(null,i),n.apply(j,i)}};j.pushState=q("pushState",N),j.replaceState=q("replaceState",N),b.querySelectorAll("[class*='umami--']").forEach((function(e){e.className.split(" ").forEach((function(t){if(/^umami--/.test(t)){var n=t.split("--"),r=n[1],o=n[2];r&&o&&e.addEventListener(r,(function(){return L(R+"/api/collect",{type:"event",payload:{url:x,event_type:r,event_value:o,session:A()}})}),!0)}}))})),C(x,F)}}}();
+!function(){"use strict";function e(e){var n=this.constructor;return this.then((function(t){return n.resolve(e()).then((function(){return t}))}),(function(t){return n.resolve(e()).then((function(){return n.reject(t)}))}))}var n=setTimeout;function t(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,n){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,o._immediateFn((function(){var t=1===e._state?n.onFulfilled:n.onRejected;if(null!==t){var r;try{r=t(e._value)}catch(e){return void s(n.promise,e)}u(n.promise,r)}else(1===e._state?u:s)(n.promise,e._value)}))):e._deferreds.push(n)}function u(e,n){try{if(n===e)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if(n instanceof o)return e._state=3,e._value=n,void a(e);if("function"==typeof t)return void f((r=t,i=n,function(){r.apply(i,arguments)}),e)}e._state=1,e._value=n,a(e)}catch(n){s(e,n)}var r,i}function s(e,n){e._state=2,e._value=n,a(e)}function a(e){2===e._state&&0===e._deferreds.length&&o._immediateFn((function(){e._handled||o._unhandledRejectionFn(e._value)}));for(var n=0,t=e._deferreds.length;n<t;n++)i(e,e._deferreds[n]);e._deferreds=null}function c(e,n,t){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof n?n:null,this.promise=t}function f(e,n){var t=!1;try{e((function(e){t||(t=!0,u(n,e))}),(function(e){t||(t=!0,s(n,e))}))}catch(e){if(t)return;t=!0,s(n,e)}}o.prototype["catch"]=function(e){return this.then(null,e)},o.prototype.then=function(e,n){var t=new this.constructor(r);return i(this,new c(e,n,t)),t},o.prototype["finally"]=e,o.all=function(e){return new o((function(n,r){if(!t(e))return r(new TypeError("Promise.all accepts an array"));var o=Array.prototype.slice.call(e);if(0===o.length)return n([]);var i=o.length;function u(e,t){try{if(t&&("object"==typeof t||"function"==typeof t)){var s=t.then;if("function"==typeof s)return void s.call(t,(function(n){u(e,n)}),r)}o[e]=t,0==--i&&n(o)}catch(e){r(e)}}for(var s=0;s<o.length;s++)u(s,o[s])}))},o.resolve=function(e){return e&&"object"==typeof e&&e.constructor===o?e:new o((function(n){n(e)}))},o.reject=function(e){return new o((function(n,t){t(e)}))},o.race=function(e){return new o((function(n,r){if(!t(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(n,r)}))},o._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){n(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,n){return n=n||{},new Promise((function(t,r){var o=new XMLHttpRequest,i=[],u=[],s={},a=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:a,headers:{keys:function(){return i},entries:function(){return u},get:function(e){return s[e.toLowerCase()]},has:function(e){return e.toLowerCase()in s}}}};for(var c in o.open(n.method||"get",e,!0),o.onload=function(){o.getAllResponseHeaders().replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm,(function(e,n,t){i.push(n=n.toLowerCase()),u.push([n,t]),s[n]=s[n]?s[n]+","+t:t})),t(a())},o.onerror=r,o.withCredentials="include"==n.credentials,n.headers)o.setRequestHeader(c,n.headers[c]);o.send(n.body||null)}))});var p=window.screen,d=p.width,h=p.height,v=window.navigator.language,y=window.location,m=y.hostname,w=y.pathname,_=y.search,g=window.localStorage,b=window.document,j=window.history,P=b.querySelector("script[data-website-id]");if(P){var S=P.getAttribute("data-website-id");if(S){var T="umami.session",E=new URL(P.src).origin,R=d+"x"+h,L=""+w+_,x=b.referrer,F=[],O=function(e,n){return fetch(e,{method:"post",cache:"no-cache",headers:{Accept:"application/json","Content-Type":"application/json"},body:JSON.stringify(n)}).then((function(e){return e.json()}))},A=function(e){return O(E+"/api/session",e).then((function(e){var n=e.success,t=function(e,n){var t={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&-1===n.indexOf(r)&&(t[r]=e[r]);return t}(e,["success"]);if(n)return g.setItem(T,JSON.stringify(t)),n}))},I=function(){return JSON.parse(g.getItem(T))},N=function(e,n){return O(E+"/api/collect",{type:"pageview",payload:{url:e,referrer:n,session:I()}}).then((function(e){var n=e.success;return n||g.removeItem(T),n}))},C=function(e,n){var t=function(e){return{website_id:S,hostname:m,url:e,screen:R,language:v}}(e);g.getItem(T)?N(e,n).then((function(r){return!r&&A(t).then((function(t){return t&&N(e,n)}))})):A(t).then((function(t){return t&&N(e,n)}))},q=function(e,n,t){H(),x=L,C(L=t,x),setTimeout(U,300)},J=function(e,n){var t=j[e];return function(e,r,o){var i=[e,r,o];return n.apply(null,i),t.apply(j,i)}};j.pushState=J("pushState",q),j.replaceState=J("replaceState",q);var H=function(){F.forEach((function(e){var n=e[0],t=e[1],r=e[2];console.log("removed",n.tagName,t),n.removeEventListener(t,r,!0)})),F.length=0},U=function(){b.querySelectorAll("[class*='umami--']").forEach((function(e){e.className.split(" ").forEach((function(n){if(/^umami--/.test(n)){var t=n.split("--"),r=t[1],o=t[2];if(r&&o){var i=function(){return O(E+"/api/collect",{type:"event",payload:{url:L,event_type:r,event_value:o,session:I()}})};F.push([e,r,i]),e.addEventListener(r,i,!0)}}}))}))};C(L,x),U()}}}();
diff --git a/scripts/umami/index.js b/scripts/umami/index.js
index 941e6c04..d3653946 100644
--- a/scripts/umami/index.js
+++ b/scripts/umami/index.js
@@ -23,6 +23,7 @@ if (script) {
     const screen = `${width}x${height}`;
     let currentUrl = `${pathname}${search}`;
     let currenrRef = document.referrer;
+    const listeners = [];
 
     /* Helper methods */
 
@@ -82,9 +83,11 @@ if (script) {
     /* Handle push state */
 
     const handlePush = (state, title, url) => {
+      removeEvents();
       currenrRef = currentUrl;
       currentUrl = url;
       execute(currentUrl, currenrRef);
+      setTimeout(loadEvents, 300);
     };
 
     const hook = (type, cb) => {
@@ -101,19 +104,32 @@ if (script) {
 
     /* Handle events */
 
-    document.querySelectorAll("[class*='umami--']").forEach(e => {
-      e.className.split(' ').forEach(c => {
-        if (/^umami--/.test(c)) {
-          const [, event, value] = c.split('--');
-          if (event && value) {
-            e.addEventListener(event, () => trackEvent(currentUrl, event, value), true);
-          }
-        }
+    const removeEvents = () => {
+      listeners.forEach(([element, type, listener]) => {
+        console.log('removed', element.tagName, type);
+        element.removeEventListener(type, listener, true);
       });
-    });
+      listeners.length = 0;
+    };
+
+    const loadEvents = () => {
+      document.querySelectorAll("[class*='umami--']").forEach(element => {
+        element.className.split(' ').forEach(className => {
+          if (/^umami--/.test(className)) {
+            const [, type, value] = className.split('--');
+            if (type && value) {
+              const listener = () => trackEvent(currentUrl, type, value);
+              listeners.push([element, type, listener]);
+              element.addEventListener(type, listener, true);
+            }
+          }
+        });
+      });
+    };
 
     /* Start */
 
     execute(currentUrl, currenrRef);
+    loadEvents();
   }
 }