diff --git a/dist/report.html b/dist/report.html
index abbd949..dcaf711 100644
--- a/dist/report.html
+++ b/dist/report.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <title>@a2nt/meta-lightbox-js [12 Apr 2022 at 15:16]</title>
+    <title>@a2nt/meta-lightbox-js [12 Apr 2022 at 15:17]</title>
     <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABrVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+O1foceMD///+J0/qK1Pr7/v8Xdr/9///W8P4UdL7L7P0Scr2r4Pyj3vwad8D5/f/2/f+55f3E6f34+/2H0/ojfMKpzOd0rNgQcb3F3O/j9f7c8v6g3Pz0/P/w+v/q+P7n9v6T1/uQ1vuE0vqLut/y+v+Z2fvt+f+15Pzv9fuc2/vR7v2V2Pvd6/bg9P7I6/285/2y4/yp3/zp8vk8i8kqgMT7/P31+fyv4vxGkcz6/P6/6P3j7vfS5PNnpNUxhcbO7f7F6v3O4vHK3/DA2u631Ouy0eqXweKJud5wqthfoNMMbLvY8f73+v2dxeR8sNtTmdDx9/zX6PSjyeaCtd1YnNGX2PuQveCGt95Nls42h8dLlM3F4vBtAAAAM3RSTlMAAyOx0/sKBvik8opWGBMOAe3l1snDm2E9LSb06eHcu5JpHbarfHZCN9CBb08zzkdNS0kYaptYAAAFV0lEQVRYw92X51/aYBDHHS2O2qqttVbrqNq9m+TJIAYIShBkWwqIiCgoWvfeq7Z2/s29hyQNyUcR7LveGwVyXy6XH8/9rqxglLfUPLxVduUor3h0rfp2TYvpivk37929TkG037hffoX0+peVtZQc1589rigVUdXS/ABSAyEmGIO/1XfvldSK8vs3OqB6u3m0nxmIrvgB0dj7rr7Y9IbuF68hnfFaiHA/sxqm0wciIG43P60qKv9WXWc1RXGh/mFESFABTSBi0sNAKzqet17eCtOb3kZIDwxEEU0oAIJGYxNBDhBND29e0rtXXbcpuPmED9IhEAAQ/AXEaF8EPmnrrKsv0LvWR3fg5sWDNAFZOgAgaKvZDogHNU9MFwnnYROkc56RD5CjAbQX9Ow4g7upCsvYu55aSI/Nj0H1akgKQEUM94dwK65hYRmFU9MIcH/fqJYOZYcnuJSU/waKDgTOEVaVKhwrTRP5XzgSpAITYzom7UvkhFX5VutmxeNnWDjjswTKTyfgluNDGbUpWissXhF3s7mlSml+czWkg3D0l1nNjGNjz3myOQOa1KM/jOS6ebdbAVTCi4gljHSFrviza7tOgRWcS0MOUX9zdNgag5w7rRqA44Lzw0hr1WqES36dFliSJFlh2rXIae3FFcDDgKdxrUIDePr8jGcSClV1u7A9xeN0ModY/pHMxmR1EzRh8TJiwqsHmKW0l4FCEZI+jHio+JdPPE9qwQtTRxku2D8sIeRL2LnxWSllANCQGOIiqVHAz2ye2JR0DcH+HoxDkaADLjgxjKQ+AwCX/g0+DNgdG0ukYCONAe+dbc2IAc6fwt1ARoDSezNHxV2Cmzwv3O6lDMV55edBGwGK9n1+x2F8EDfAGCxug8MhpsMEcTEAWf3rx2vZhe/LAmtIn/6apE6PN0ULKgywD9mmdxbmFl3OvD5AS5fW5zLbv/YHmcsBTjf/afDz3MaZTVCfAP9z6/Bw6ycv8EUBWJIn9zYcoAWWlW9+OzO3vkTy8H+RANLmdrpOuYWdZYEXpo+TlCJrW5EARb7fF+bWdqf3hhyZI1nWJQHgznErZhbjoEsWqi8dQNoE294aldzFurwSABL2XXMf9+H1VQGke9exw5P/AnA5Pv5ngMul7LOvO922iwACu8WkCwLCafvM4CeWPxfA8lNHcWZSoi8EwMAIciKX2Z4SWCMAa3snCZ/G4EA8D6CMLNFsGQhkkz/gQNEBbPCbWsxGUpYVu3z8IyNAknwJkfPMEhLyrdi5RTyUVACkw4GSFRNWJNEW+fgPGwHD8/JxnRuLabN4CGNRkAE23na2+VmEAUmrYymSGjMAYqH84YUIyzgzs3XC7gNgH36Vcc4zKY9o9fgPBXUAiHHwVboBHGLiX6Zcjp1f2wu4tvzZKo0ecPnDtQYDQvJXaBeNzce45Fp28ZQLrEZVuFqgBwOalArKXnW1UzlnSusQKJqKYNuz4tOnI6sZG4zanpemv+7ySU2jbA9h6uhcgpfy6G2PahirDZ6zvq6zDduMVFTKvzw8wgyEdelwY9in3XkEPs3osJuwRQ4qTkfzifndg9Gfc4pdsu82+tTnHZTBa2EAMrqr2t43pguc8tNm7JQVQ2S0ukj2d22dhXYP0/veWtwKrCkNoNimAN5+Xr/oLrxswKbVJjteWrX7eR63o4j9q0GxnaBdWgGA5VStpanIjQmEhV0/nVt5VOFUvix6awJhPcAaTEShgrG+iGyvb5a0Ndb1YGHFPEwoqAinoaykaID1o1pdPNu7XsnCKQ3R+hwWIIhGvORcJUBYXe3Xa3vq/mF/N9V13ugufMkfXn+KHsRD0B8AAAAASUVORK5CYII=" type="image/x-icon" />
 
     <script>
diff --git a/package.json b/package.json
index d198bfb..cbadfa7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@a2nt/meta-lightbox-js",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Universal lightbox",
   "author": "Tony Air <tony@twma.pro>",
   "license": "BSD-2-Clause",
diff --git a/src/js/window.js b/src/js/window.js
index 46d8229..b7b3f58 100755
--- a/src/js/window.js
+++ b/src/js/window.js
@@ -18,25 +18,63 @@ class MetaWindow {
     extraClass: null,
   };
 
+  cleanLinks() {
+    document.querySelectorAll(`[data-toggle="lightbox"]`)
+      .forEach((el) => {
+        el.classList.remove('loading');
+      });
+  }
+
+  collectGaleries(gallery) {
+    const ui = this;
+
+    if (!gallery) {
+      return;
+    }
+
+    ui.state.collections[gallery] = [];
+    document
+      .querySelectorAll(
+        `[data-toggle="lightbox"][data-gallery="${gallery}"]`
+      )
+      .forEach((el) => {
+        ui.state.collections[gallery].push(el);
+      });
+  }
+
+  toggle(el) {
+    const ui = this;
+
+    ui.cleanLinks();
+
+    const link = el.getAttribute('href') || el.getAttribute('data-href');
+    const embed = el.getAttribute('data-embed');
+    el.classList.add('loading');
+    ui.state.current = el;
+
+    const title = el.getAttribute('data-title');
+    if (title) {
+      ui.setCaption(title);
+    }
+
+    if (embed) {
+      ui.embed(link);
+    } else {
+      ui.load(link);
+    }
+
+    ui.addExtraClass(el.getAttribute('data-lightbox-class'));
+  }
+
   init() {
     const ui = this;
     console.log(`MetaWindow: [links] init`);
 
-    // collect new collections
     document
-      .querySelectorAll('[data-toggle="lightbox"],[data-gallery="${gallery}"]')
+      .querySelectorAll(`[data-toggle="lightbox"],[data-gallery]`)
       .forEach((el) => {
         const gallery = el.getAttribute('data-gallery');
-        if (gallery) {
-          ui.state.collections[gallery] = [];
-          document
-            .querySelectorAll(
-              `[data-toggle="lightbox"][data-gallery="${gallery}"]`
-            )
-            .forEach((el) => {
-              ui.state.collections[gallery].push(el);
-            });
-        }
+        ui.collectGaleries(gallery);
 
         // click handler
         el.addEventListener('click', (e) => {
@@ -44,23 +82,7 @@ class MetaWindow {
           console.log(`MetaWindow: [link] click`);
 
           const el = e.currentTarget;
-          const link = el.getAttribute('href') || el.getAttribute('data-href');
-          const embed = el.getAttribute('data-embed');
-          el.classList.add('loading');
-          ui.state.current = el;
-
-          if (embed) {
-            ui.embed(link);
-          } else {
-            ui.load(link);
-          }
-
-          const title = el.getAttribute('data-title');
-          if (title) {
-            ui.setCaption(title);
-          }
-
-          ui.addExtraClass(el.getAttribute('data-lightbox-class'));
+          ui.toggle(el);
         });
       });
   }
@@ -273,7 +295,7 @@ class MetaWindow {
 
         setTimeout(() => {
           ui.state.current.classList.remove('loading');
-        }, 3000);
+        }, 1000);
       });
   };
 
