diff --git a/front/src/components/library/Artists.vue b/front/src/components/library/Artists.vue
index 8d0a4f552d753b3fe525b3ca7c2f9fed562147ea..23a30e7711fda31fcbb61f7860fa70b93807c7c6 100644
--- a/front/src/components/library/Artists.vue
+++ b/front/src/components/library/Artists.vue
@@ -103,7 +103,7 @@ export default {
     $('.ui.dropdown').dropdown()
   },
   methods: {
-    updateQueryString: function () {
+    updateQueryString: _.debounce(function () {
       this.$router.replace({
         query: {
           query: this.query,
@@ -112,7 +112,7 @@ export default {
           ordering: this.getOrderingAsString()
         }
       })
-    },
+    }, 500),
     fetchData: _.debounce(function () {
       var self = this
       this.isLoading = true
diff --git a/front/src/components/utils/global-events.vue b/front/src/components/utils/global-events.vue
index 2905e3a7d337dddc3b66ecc528e0d4f9c607dd9f..dd25865c902d1e0237a45149521279a403a11f66 100644
--- a/front/src/components/utils/global-events.vue
+++ b/front/src/components/utils/global-events.vue
@@ -27,7 +27,7 @@ export default {
       let wrapper = function (event) {
         // we check here the event is not triggered from an input
         // to avoid collisions
-        if (!$(event.target).is(':input, [contenteditable]')) {
+        if (!$(event.target).is('.field, :input, [contenteditable]')) {
           handler(event)
         }
       }
diff --git a/front/src/router/index.js b/front/src/router/index.js
index 7db5da6bad5c78f4f18308502cf6f5f09dd74c9f..c7c46a27543bcd7b586c1e2679a0a32af3ba4597 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -50,7 +50,8 @@ export default new Router({
       component: Favorites,
       props: (route) => ({
         defaultOrdering: route.query.ordering,
-        defaultPage: route.query.page
+        defaultPage: route.query.page,
+        defaultPaginateBy: route.query.paginateBy
       })
     },
     {