diff --git a/server/ui-src/components/ListMessages.vue b/server/ui-src/components/ListMessages.vue
index 6da9525..6d74582 100644
--- a/server/ui-src/components/ListMessages.vue
+++ b/server/ui-src/components/ListMessages.vue
@@ -2,7 +2,7 @@
 import { mailbox } from '../stores/mailbox'
 import CommonMixins from '../mixins/CommonMixins'
 import dayjs from 'dayjs'
-import {pagination} from "../stores/pagination";
+import { pagination } from "../stores/pagination";
 
 export default {
 	mixins: [
@@ -16,6 +16,7 @@ export default {
 	data() {
 		return {
 			mailbox,
+			pagination,
 		}
 	},
 
@@ -102,11 +103,17 @@ export default {
 		},
 
 		toTagUrl: function (t) {
-			const params = new URLSearchParams({
-				start: String(0),
-				limit: pagination.limit.toString(),
-			})
-			return '/search?q=' + this.tagEncodeURI(t) + '&' + params.toString()
+			if (t.match(/ /)) {
+				t = `"${t}"`
+			}
+			const p = {
+				q: 'tag:' + t
+			}
+			if (pagination.limit != pagination.defaultLimit) {
+				p.limit = pagination.limit.toString()
+			}
+			const params = new URLSearchParams(p)
+			return '/search?' + params.toString()
 		},
 	}
 }
@@ -153,6 +160,7 @@ export default {
 					</div>
 					<div v-if="message.Tags.length">
 						<RouterLink class="badge me-1" v-for="t in message.Tags" :to="toTagUrl(t)"
+							v-on:click="pagination.start = 0"
 							:style="mailbox.showTagColors ? { backgroundColor: colorHash(t) } : { backgroundColor: '#6c757d' }"
 							:title="'Filter messages tagged with ' + t">
 							{{ t }}
diff --git a/server/ui-src/components/NavTags.vue b/server/ui-src/components/NavTags.vue
index b023343..0b1ae29 100644
--- a/server/ui-src/components/NavTags.vue
+++ b/server/ui-src/components/NavTags.vue
@@ -11,25 +11,11 @@ export default {
 	data() {
 		return {
 			mailbox,
+			pagination,
 		}
 	},
 
 	methods: {
-		// if the current filter is active then reload view
-		reloadFilter: function (tag) {
-			const urlParams = new URLSearchParams(window.location.search)
-			const query = urlParams.get('q')
-			if (!query) {
-				return false
-			}
-
-			let re = new RegExp(`^tag:"?${tag}"?$`, 'i')
-			if (query.match(re)) {
-				pagination.start = 0
-				this.$emit('loadMessages')
-			}
-		},
-
 		// test whether a tag is currently being searched for (in the URL)
 		inSearch: function (tag) {
 			const urlParams = new URLSearchParams(window.location.search)
@@ -76,12 +62,18 @@ export default {
 			}
 		},
 
-		toTagUrl(tag) {
-			const params = new URLSearchParams({
-				start: String(0),
-				limit: pagination.limit.toString(),
-			})
-			return '/search?q=' + this.tagEncodeURI(tag) + '&' + params.toString()
+		toTagUrl(t) {
+			if (t.match(/ /)) {
+				t = `"${t}"`
+			}
+			const p = {
+				q: 'tag:' + t
+			}
+			if (pagination.limit != pagination.defaultLimit) {
+				p.limit = pagination.limit.toString()
+			}
+			const params = new URLSearchParams(p)
+			return '/search?' + params.toString()
 		},
 	}
 }
@@ -105,7 +97,7 @@ export default {
 		</div>
 		<div class="list-group mt-1 mb-5 pb-3">
 			<RouterLink v-for="tag in mailbox.tags" :to="toTagUrl(tag)" @click="hideNav"
-				v-on:click="reloadFilter(tag)" v-on:click.ctrl="toggleTag($event, tag)"
+				v-on:click="pagination.start = 0" v-on:click.ctrl="toggleTag($event, tag)"
 				:style="mailbox.showTagColors ? { borderLeftColor: colorHash(tag), borderLeftWidth: '4px' } : ''"
 				class="list-group-item list-group-item-action small px-2" :class="inSearch(tag) ? 'active' : ''">
 				<i class="bi bi-tag-fill" v-if="inSearch(tag)"></i>
diff --git a/server/ui-src/components/Notifications.vue b/server/ui-src/components/Notifications.vue
index 945e5a1..e872ac7 100644
--- a/server/ui-src/components/Notifications.vue
+++ b/server/ui-src/components/Notifications.vue
@@ -15,7 +15,8 @@ export default {
 			reconnectRefresh: false,
 			socketURI: false,
 			pauseNotifications: false, // prevent spamming
-			version: false
+			version: false,
+			paginationDelayed: false, // for delayed pagination URL changes
 		}
 	},
 
@@ -60,13 +61,8 @@ export default {
 						} else {
 							// update pagination offset
 							pagination.start++
-							const path = self.$route.path
-							const params = new URLSearchParams({
-								...self.$route.query,
-								start: pagination.start.toString(),
-								limit: pagination.limit.toString(),
-							})
-							self.$router.push(path + '?' + params.toString())
+							// prevent "Too many calls to Location or History APIs within a short timeframe"
+							self.delayedPaginationUpdate()
 						}
 					}
 
@@ -128,6 +124,38 @@ export default {
 			}
 		},
 
+		// This will only update the pagination offset at a maximum of 2x per second
+		// when viewing the inbox on > page 1, while receiving an influx of new messages.
+		delayedPaginationUpdate: function () {
+			if (this.paginationDelayed) {
+				return
+			}
+
+			this.paginationDelayed = true
+
+			window.setTimeout(() => {
+				const path = this.$route.path
+				const p = {
+					...this.$route.query
+				}
+				if (pagination.start > 0) {
+					p.start = pagination.start.toString()
+				} else {
+					delete p.start
+				}
+				if (pagination.limit != pagination.defaultLimit) {
+					p.limit = pagination.limit.toString()
+				} else {
+					delete p.limit
+				}
+
+				const params = new URLSearchParams(p)
+				this.$router.push(path + '?' + params.toString())
+
+				this.paginationDelayed = false
+			}, 500)
+		},
+
 		browserNotify: function (title, message) {
 			if (!("Notification" in window)) {
 				return
diff --git a/server/ui-src/components/Pagination.vue b/server/ui-src/components/Pagination.vue
index 9998061..6d029f1 100644
--- a/server/ui-src/components/Pagination.vue
+++ b/server/ui-src/components/Pagination.vue
@@ -1,7 +1,7 @@
 <script>
 import CommonMixins from '../mixins/CommonMixins'
 import { mailbox } from '../stores/mailbox'
-import {limitOptions, pagination} from '../stores/pagination'
+import { limitOptions, pagination } from '../stores/pagination'
 
 export default {
 
@@ -66,11 +66,20 @@ export default {
 
 		updateQueryParams: function () {
 			const path = this.$route.path
-			const params = new URLSearchParams({
-				...this.$route.query,
-				start: pagination.start.toString(),
-				limit: pagination.limit.toString(),
-			})
+			const p = {
+				...this.$route.query
+			}
+			if (pagination.start > 0) {
+				p.start = pagination.start.toString()
+			} else {
+				delete p.start
+			}
+			if (pagination.limit != pagination.defaultLimit) {
+				p.limit = pagination.limit.toString()
+			} else {
+				delete p.limit
+			}
+			const params = new URLSearchParams(p)
 			this.$router.push(path + '?' + params.toString())
 		},
 	}
@@ -80,7 +89,7 @@ export default {
 <template>
 	<select v-model="pagination.limit" @change="changeLimit" class="form-select form-select-sm d-inline w-auto me-2"
 		:disabled="total == 0">
-		<option v-for="option in limitOptions" :key="option" :value="option">{{option}}</option>
+		<option v-for="option in limitOptions" :key="option" :value="option">{{ option }}</option>
 	</select>
 
 	<small>
diff --git a/server/ui-src/components/SearchForm.vue b/server/ui-src/components/SearchForm.vue
index 79ab698..c90e780 100644
--- a/server/ui-src/components/SearchForm.vue
+++ b/server/ui-src/components/SearchForm.vue
@@ -40,11 +40,17 @@ export default {
 					pagination.start = 0
 					this.$emit('loadMessages')
 				}
-				const params = new URLSearchParams({
-					q: this.search,
-					start: pagination.start.toString(),
-					limit: pagination.limit.toString(),
-				})
+				const p = {
+					q: this.search
+				}
+				if (pagination.start > 0) {
+					p.start = pagination.start.toString()
+				}
+				if (pagination.limit != pagination.defaultLimit) {
+					p.limit = pagination.limit.toString()
+				}
+
+				const params = new URLSearchParams(p)
 				this.$router.push('/search?' + params.toString())
 			}
 
diff --git a/server/ui-src/stores/pagination.js b/server/ui-src/stores/pagination.js
index 342b553..91e0bc7 100644
--- a/server/ui-src/stores/pagination.js
+++ b/server/ui-src/stores/pagination.js
@@ -3,6 +3,7 @@ import { reactive } from 'vue'
 export const pagination = reactive({
 	start: 0,	// pagination offset
 	limit: 50, 	// per page
+	defaultLimit: 50, // used to shorten URL's if current limit == defaultLimit
 	total: 0,  	// total results of current view / filter
 	count: 0, 	// number of messages currently displayed
 })
diff --git a/server/ui-src/views/MessageView.vue b/server/ui-src/views/MessageView.vue
index d81bcd5..19fc53c 100644
--- a/server/ui-src/views/MessageView.vue
+++ b/server/ui-src/views/MessageView.vue
@@ -184,17 +184,26 @@ export default {
 			mailbox.lastMessage = this.$route.params.id
 
 			if (mailbox.searching) {
-				const params = new URLSearchParams({
-					q: mailbox.searching,
-					start: pagination.start.toString(),
-					limit: pagination.limit.toString(),
-				})
+				const p = {
+					q: mailbox.searching
+				}
+				if (pagination.start > 0) {
+					p.start = pagination.start.toString()
+				}
+				if (pagination.limit != pagination.defaultLimit) {
+					p.limit = pagination.limit.toString()
+				}
+				const params = new URLSearchParams(p)
 				this.$router.push('/search?' + params.toString())
 			} else {
-				const params = new URLSearchParams({
-					start: pagination.start.toString(),
-					limit: pagination.limit.toString(),
-				})
+				const p = {}
+				if (pagination.start > 0) {
+					p.start = pagination.start.toString()
+				}
+				if (pagination.limit != pagination.defaultLimit) {
+					p.limit = pagination.limit.toString()
+				}
+				const params = new URLSearchParams(p)
 				this.$router.push('/?' + params.toString())
 			}
 		},
@@ -230,7 +239,8 @@ export default {
 				<i class="bi bi-eye-slash"></i> <span class="d-none d-md-inline">Mark unread</span>
 			</button>
 			<button class="btn btn-outline-light me-1 me-sm-2" title="Release message"
-				v-if="mailbox.uiConfig.MessageRelay && mailbox.uiConfig.MessageRelay.Enabled" v-on:click="initReleaseModal">
+				v-if="mailbox.uiConfig.MessageRelay && mailbox.uiConfig.MessageRelay.Enabled"
+				v-on:click="initReleaseModal">
 				<i class="bi bi-send"></i> <span class="d-none d-md-inline">Release</span>
 			</button>
 			<button class="btn btn-outline-light me-1 me-sm-2" title="Delete message" v-on:click="deleteMessage">
@@ -350,6 +360,7 @@ export default {
 
 	<AboutMailpit modals />
 	<AjaxLoader :loading="loading" />
-	<Release v-if="mailbox.uiConfig.MessageRelay && message" ref="ReleaseRef" :message="message" @delete="deleteMessage" />
+	<Release v-if="mailbox.uiConfig.MessageRelay && message" ref="ReleaseRef" :message="message"
+		@delete="deleteMessage" />
 	<Screenshot v-if="message" ref="ScreenshotRef" :message="message" />
 </template>