diff --git a/src/tags/pagination.tag b/src/tags/pagination.tag
index 1263a9e..0607d1a 100644
--- a/src/tags/pagination.tag
+++ b/src/tags/pagination.tag
@@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       var buttons = Array.isArray(this.tags['material-button']) ? this.tags['material-button'] : [this.tags['material-button']];
       buttons.forEach(function(button) {
         button.root.onclick = function() {
-          registryUI.updateQueryString(registryUI.getQueryParams({ page: button.p.page }) );
           registryUI.taglist.instance.trigger('page-update', button.p.page)
         }
       });
diff --git a/src/tags/remove-image.tag b/src/tags/remove-image.tag
index d3ed8c5..5e0212a 100644
--- a/src/tags/remove-image.tag
+++ b/src/tags/remove-image.tag
@@ -22,7 +22,55 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
   <script type="text/javascript">
     const self = this;
 
-    this.on('update', function() {
+    this.on('updated', function() {
+    });
+
+    this.on('updated', function() {
+      if (self.multiDelete == self.opts.multiDelete) {
+        return;
+      }
+      if (this.tags['material-button']) {
+        this.delete = this.tags['material-button'].root.onclick = function(ignoreError) {
+          const name = self.opts.image.name;
+          const tag = self.opts.image.tag;
+          const oReq = new Http();
+          oReq.addEventListener('loadend', function() {
+            registryUI.taglist.go(name);
+            if (this.status == 200) {
+              if (!this.hasHeader('Docker-Content-Digest')) {
+                registryUI.errorSnackbar('You need to add Access-Control-Expose-Headers: [\'Docker-Content-Digest\'] in your server configuration.');
+                return;
+              }
+              const digest = this.getResponseHeader('Docker-Content-Digest');
+              const oReq = new Http();
+              oReq.addEventListener('loadend', function() {
+                if (this.status == 200 || this.status == 202) {
+                  registryUI.taglist.display()
+                  registryUI.snackbar('Deleting ' + name + ':' + tag + ' image. Run `registry garbage-collect config.yml` on your registry');
+                } else if (this.status == 404) {
+                  ignoreError || registryUI.errorSnackbar('Digest not found');
+                } else {
+                  registryUI.snackbar(this.responseText);
+                }
+              });
+              oReq.open('DELETE', registryUI.url() + '/v2/' + name + '/manifests/' + digest);
+              oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json');
+              oReq.addEventListener('error', function() {
+                registryUI.errorSnackbar('An error occurred when deleting image. Check if your server accept DELETE methods Access-Control-Allow-Methods: [\'DELETE\'].');
+              });
+              oReq.send();
+            } else if (this.status == 404) {
+              registryUI.errorSnackbar('Manifest for ' + name + ':' + tag + ' not found');
+            } else {
+              registryUI.snackbar(this.responseText);
+            }
+          });
+          oReq.open('HEAD', registryUI.url() + '/v2/' + name + '/manifests/' + tag);
+          oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json');
+          oReq.send();
+        };
+      }
+
       if (this.tags['material-checkbox']) {
         if (!this.opts.multiDelete && this.tags['material-checkbox'].checked) {
           this.tags['material-checkbox'].toggle();
@@ -31,48 +79,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
           registryUI.taglist.instance.trigger('toggle-remove-image', this.checked);
         });
       }
-    });
-
-    this.on('mount', function() {
-      this.delete = this.tags['material-button'].root.onclick = function(ignoreError) {
-        const name = self.opts.image.name;
-        const tag = self.opts.image.tag;
-        const oReq = new Http();
-        oReq.addEventListener('loadend', function() {
-          registryUI.taglist.go(name);
-          if (this.status == 200) {
-            if (!this.hasHeader('Docker-Content-Digest')) {
-              registryUI.errorSnackbar('You need to add Access-Control-Expose-Headers: [\'Docker-Content-Digest\'] in your server configuration.');
-              return;
-            }
-            const digest = this.getResponseHeader('Docker-Content-Digest');
-            const oReq = new Http();
-            oReq.addEventListener('loadend', function() {
-              if (this.status == 200 || this.status == 202) {
-                registryUI.taglist.display()
-                registryUI.snackbar('Deleting ' + name + ':' + tag + ' image. Run `registry garbage-collect config.yml` on your registry');
-              } else if (this.status == 404) {
-                ignoreError || registryUI.errorSnackbar('Digest not found');
-              } else {
-                registryUI.snackbar(this.responseText);
-              }
-            });
-            oReq.open('DELETE', registryUI.url() + '/v2/' + name + '/manifests/' + digest);
-            oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json');
-            oReq.addEventListener('error', function() {
-              registryUI.errorSnackbar('An error occurred when deleting image. Check if your server accept DELETE methods Access-Control-Allow-Methods: [\'DELETE\'].');
-            });
-            oReq.send();
-          } else if (this.status == 404) {
-            registryUI.errorSnackbar('Manifest for ' + name + ':' + tag + ' not found');
-          } else {
-            registryUI.snackbar(this.responseText);
-          }
-        });
-        oReq.open('HEAD', registryUI.url() + '/v2/' + name + '/manifests/' + tag);
-        oReq.setRequestHeader('Accept', 'application/vnd.docker.distribution.manifest.v2+json');
-        oReq.send();
-      };
+      self.multiDelete = self.opts.multiDelete;
     });
   </script>
 </remove-image>
diff --git a/src/tags/taglist.tag b/src/tags/taglist.tag
index c207d11..f06bedf 100644
--- a/src/tags/taglist.tag
+++ b/src/tags/taglist.tag
@@ -114,7 +114,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     });
 
     this.on('page-update', function(page) {
-      self.page = page;
+      self.page = page < 1 ? 1 : page;
+      registryUI.updateQueryString(registryUI.getQueryParams({ page: self.page }) );
       this.toDelete = 0;
       this.update();
     });
@@ -167,6 +168,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
             registryUI.taglist.tags = registryUI.taglist.tags.map(function(tag) {
               return new registryUI.DockerImage(registryUI.taglist.name, tag);
             }).sort(registryUI.DockerImage.compare);
+            self.trigger('page-update', Math.min(self.page, registryUI.getNumPages(registryUI.taglist.tags)))
           } else if (this.status == 404) {
             registryUI.snackbar('Server not found', true);
           } else {