diff --git a/add-on/manifest.json b/add-on/manifest.json
index 6029a0c..f7985ee 100644
--- a/add-on/manifest.json
+++ b/add-on/manifest.json
@@ -1,13 +1,7 @@
 {
   "manifest_version": 2,
-  "applications": {
-    "gecko": {
-      "id": "{fb986c76-c042-49b8-85b5-c3dd68e83440}",
-      "strict_min_version": "54.0"
-    }
-  },
   "name": "WebAPI Manager",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Improves browser security and privacy by controlling page access to the Web API.",
   "icons": {
     "48": "images/uic-48.png",
@@ -35,7 +29,6 @@
   ],
   "content_scripts": [
     {
-      "matches": ["*://*/*"],
       "js": [
         "lib/third_party/js.cookie.js",
         "lib/third_party/sjcl.js",
@@ -46,8 +39,12 @@
         "lib/proxyblock.js",
         "content_scripts/instrument.js"
       ],
-      "all_frames": true,
-      "run_at": "document_start"
+      "matches": [
+        "<all_urls>"
+      ],
+      "run_at": "document_start",
+      "match_about_blank": true,
+      "all_frames": true
     }
   ],
   "background": {
@@ -69,5 +66,11 @@
   "options_ui": {
     "page": "config/index.html",
     "open_in_tab": true
+  },
+  "applications": {
+    "gecko": {
+      "id": "{fb986c76-c042-49b8-85b5-c3dd68e83440}",
+      "strict_min_version": "52.0"
+    }
   }
 }
diff --git a/package-lock.json b/package-lock.json
index c5a8e26..ea0f5e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "web-api-manager",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -607,6 +607,15 @@
       "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
       "dev": true
     },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      }
+    },
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
@@ -8328,6 +8337,23 @@
       "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
       "dev": true
     },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.1"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        }
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/package.json b/package.json
index 90d4bac..6e4ddd1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web-api-manager",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Tools to generate Web API managing browser extensions for Firefox and Chrome.",
   "author": "Peter Snyder <psnyde2@uic.edu> (https://www.cs.uic.edu/~psnyder/)",
   "license": "GPL-3.0",
@@ -27,9 +27,11 @@
     "test:lint": "node_modules/eslint/bin/eslint.js .",
     "test:lint:fix": "node_modules/eslint/bin/eslint.js --fix .",
     "test:func": "npm run clean; npm run bundle && ln -s `ls dist/` dist/webapi_manager.zip && node_modules/mocha/bin/mocha test/functional/*.js",
+    "test:func:block": "npm run clean; npm run bundle && ln -s `ls dist/` dist/webapi_manager.zip && node_modules/mocha/bin/mocha test/functional/block.js",
     "test": "npm run test:lint && npm run test:func"
   },
   "devDependencies": {
+    "assert": "^1.4.1",
     "eslint": "^4.9.0",
     "geckodriver": "^1.9.0",
     "gulp": "^3.9.1",