diff --git a/src/js/messaging.js b/src/js/messaging.js
index 779495141..898f15515 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -617,7 +617,7 @@ const onMessage = function(request, sender, callback) {
     case 'launchReporter': {
         const pageStore = µb.pageStoreFromTabId(request.tabId);
         if ( pageStore === null ) { break; }
-        if ( vAPI.net.hasUnprocessedRequest(request.tabId) ) {
+        if ( pageStore.hasUnprocessedRequest ) {
             request.popupPanel.hasUnprocessedRequest = true;
         }
         vAPI.tabs.executeScript(request.tabId, {
@@ -1436,7 +1436,7 @@ const getSupportData = async function() {
     }
     if ( Object.keys(addedListset).length === 0 ) {
         addedListset = undefined;
-    } else if ( Object.keys(addedListset).length > 20 ) {
+    } else if ( Object.keys(addedListset).length > 15 ) {
         const added = Object.keys(addedListset);
         const truncated = added.slice(20);
         for ( const key of truncated ) {
diff --git a/src/js/pagestore.js b/src/js/pagestore.js
index 7dd3eb69c..0dbdabc70 100644
--- a/src/js/pagestore.js
+++ b/src/js/pagestore.js
@@ -409,6 +409,10 @@ const PageStore = class {
         // Evaluated on-demand
         this._noCosmeticFiltering = undefined;
 
+        // Remember if the webpage was potentially improperly filtered, for
+        // reporting purpose.
+        this.hasUnprocessedRequest = vAPI.net.hasUnprocessedRequest(tabId);
+
         return this;
     }