diff --git a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Components/Pager/Default.cshtml b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Components/Pager/Default.cshtml
index e55e5dc..4b06495 100644
--- a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Components/Pager/Default.cshtml
+++ b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Components/Pager/Default.cshtml
@@ -13,7 +13,7 @@
             <li class="page-item"><a class="page-link" href="@Model.PageUrl(i)">@i</a></li>
         }
         <li class="page-item @(Model.HasNextPage ? string.Empty : "disabled")">
-            <a class="page-link" href="?page=@Model.PageUrl(Model.PageNumber+1)" aria-label="Next">
+            <a class="page-link" href="@Model.PageUrl(Model.PageNumber+1)" aria-label="Next">
                 <span aria-hidden="true">&raquo;</span>
             </a>
         </li>
diff --git a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml
index 48fcca4..a553960 100644
--- a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml
+++ b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml
@@ -47,7 +47,7 @@
                         </td>
                         <td>
                             <button type="submit" class="btn btn-primary"
-                                    asp-page-handler="update" asp-route-id="@item.Id.ToString()">
+                                    asp-page-handler="update" asp-route-pageNumber="@item.ItemPageNumber"  asp-route-id="@item.Id.ToString()">
                                 <span data-feather="plus"></span> update
                             </button>
                         </td>
@@ -60,7 +60,7 @@
                         <td>@item.GroupKey</td>
                         <td colspan="2" class="text-end">
                             <button type="submit" class="btn btn-secondary"
-                                    asp-page-handler="edit" asp-route-id="@item.Id.ToString()">
+                                    asp-page-handler="edit" asp-route-pageNumber="@item.ItemPageNumber" asp-route-id="@item.Id.ToString()">
                                 <span data-feather="edit"></span> edit
                             </button>
                             <button type="submit" class="btn btn-danger"
diff --git a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs
index 64cf558..049ca49 100644
--- a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs
+++ b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Index.cshtml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Web;
 using EPiServer;
 using EPiServer.Core;
 using EPiServer.Data;
@@ -103,9 +104,18 @@ public IActionResult OnPostDelete(string id)
 
         private void Load()
         {
+            SetPageNumberFromQueryString();
+
             var items = FindTags().ToPagedList(Paging.PageNumber, Paging.PageSize);
             Items = items;
         }
+        private void SetPageNumberFromQueryString()
+        {
+            if (HttpContext.Request.Query.TryGetValue("pageNumber", out var value) && int.TryParse(value, out var pageNumber))
+            {
+                Paging.PageNumber = pageNumber == 0 ? 1 : pageNumber;
+            }
+        }
 
         private IEnumerable<Tag> FindTags()
         {
diff --git a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Models/Paging.cs b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Models/Paging.cs
index 08b6195..46e3ac5 100644
--- a/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Models/Paging.cs
+++ b/src/Geta.Optimizely.Tags/Areas/GetaOptimizelyTags/Pages/Models/Paging.cs
@@ -1,15 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace Geta.Optimizely.Tags.Pages.Geta.Optimizely.Tags.Models
-{
-    public class Paging
-    {
-        public const int DefaultPageSize = 50;
+namespace Geta.Optimizely.Tags.Pages.Geta.Optimizely.Tags.Models;
 
-        [FromQuery(Name = "page")]
-        public int PageNumber { get; set; } = 1;
+public class Paging
+{
+    [FromQuery(Name = "page")]
+    public int PageNumber { get; set; } = 1;
 
-        [FromQuery(Name = "page-size")]
-        public int PageSize { get; set; } = DefaultPageSize;
-    }
+    public static int PageSize { get => 50; }
 }
diff --git a/src/Geta.Optimizely.Tags/Core/Tag.cs b/src/Geta.Optimizely.Tags/Core/Tag.cs
index 4a6c8f4..e68d146 100644
--- a/src/Geta.Optimizely.Tags/Core/Tag.cs
+++ b/src/Geta.Optimizely.Tags/Core/Tag.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Geta Digital. All rights reserved.
+// Copyright (c) Geta Digital. All rights reserved.
 // Licensed under Apache-2.0. See the LICENSE file in the project root for more information
 
 using System;
@@ -31,6 +31,8 @@ public class Tag
 
         public bool CheckedEditContentTags { get; set; }
 
+        public int ItemPageNumber { get; set; }
+
         public override int GetHashCode()
         {
             return Name == null ? base.GetHashCode() : Name.GetHashCode();
diff --git a/src/Geta.Optimizely.Tags/TagsScheduledJob.cs b/src/Geta.Optimizely.Tags/TagsScheduledJob.cs
index 20a8347..58c33ec 100644
--- a/src/Geta.Optimizely.Tags/TagsScheduledJob.cs
+++ b/src/Geta.Optimizely.Tags/TagsScheduledJob.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Geta Digital. All rights reserved.
+// Copyright (c) Geta Digital. All rights reserved.
 // Licensed under Apache-2.0. See the LICENSE file in the project root for more information
 
 using System;
@@ -10,6 +10,8 @@
 using EPiServer.PlugIn;
 using EPiServer.Scheduler;
 using Geta.Optimizely.Tags.Core;
+using Geta.Optimizely.Tags.Pages.Geta.Optimizely.Tags.Models;
+using X.PagedList;
 
 namespace Geta.Optimizely.Tags
 {
@@ -36,6 +38,7 @@ public TagsScheduledJob(
         public override string Execute()
         {
             var tags = _tagService.GetAllTags().ToList();
+            SetTagPageNumber(tags.ToPagedList());
             var contentGuids = GetTaggedContentGuids(tags);
 
             foreach (var contentGuid in contentGuids)
@@ -165,6 +168,17 @@ private void RemoveFromAllTags(Guid guid, IEnumerable<Tag> tags)
             }
         }
 
+        private void SetTagPageNumber(IPagedList<Tag> items)
+        {
+            for (var i = 0; i < items.Count; i++)
+            {
+                var itemPageNumber = (i / Paging.PageSize) + 1;
+                var tag = _tagService.GetTagById(items[i].Id);
+                tag.ItemPageNumber = itemPageNumber;
+                _tagService.Save(tag);
+            }
+        }
+
         public override void Stop()
         {
             _stop = true;